equal
deleted
inserted
replaced
99 if(aElement != NULL) |
99 if(aElement != NULL) |
100 { |
100 { |
101 CSvgElementImpl* lParentElement = (CSvgElementImpl*)aElement->ParentNode (); |
101 CSvgElementImpl* lParentElement = (CSvgElementImpl*)aElement->ParentNode (); |
102 while(lParentElement && (lParentElement->iSvgStyleProperties != NULL)) |
102 while(lParentElement && (lParentElement->iSvgStyleProperties != NULL)) |
103 { |
103 { |
|
104 if(!lParentElement) |
|
105 return EFalse; |
104 if (aElement->iSvgStyleProperties->operator[](aAttrIndex) == |
106 if (aElement->iSvgStyleProperties->operator[](aAttrIndex) == |
105 lParentElement->iSvgStyleProperties->operator[](aAttrIndex)) |
107 lParentElement->iSvgStyleProperties->operator[](aAttrIndex)) |
106 { |
108 { |
107 return ETrue; |
109 return ETrue; |
108 } |
110 } |
669 case KCSS_ATTR_FONTFAMILY: |
671 case KCSS_ATTR_FONTFAMILY: |
670 if( ElemID() == KSvgFontfaceElement ) |
672 if( ElemID() == KSvgFontfaceElement ) |
671 { |
673 { |
672 ((CSvgFontFaceElementImpl *)this)->SetFontFamilyL(aValue); |
674 ((CSvgFontFaceElementImpl *)this)->SetFontFamilyL(aValue); |
673 } |
675 } |
674 break; |
676 |
675 |
|
676 case KCSS_ATTR_STROKE_LINECAP: |
677 case KCSS_ATTR_STROKE_LINECAP: |
677 case KCSS_ATTR_STROKE_LINEJOIN: |
678 case KCSS_ATTR_STROKE_LINEJOIN: |
678 case KCSS_ATTR_FILLRULE: |
679 case KCSS_ATTR_FILLRULE: |
679 { |
680 { |
680 CStrCssValueImpl* tParentValue = NULL; |
681 CStrCssValueImpl* tParentValue = NULL; |
2310 if( lParentElement && aValue == KInherit ) |
2311 if( lParentElement && aValue == KInherit ) |
2311 { |
2312 { |
2312 //tParentValue = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId)); |
2313 //tParentValue = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId)); |
2313 //(*iSvgStyleProperties)[aNameId]= tParentValue; |
2314 //(*iSvgStyleProperties)[aNameId]= tParentValue; |
2314 if(tParentValue) |
2315 if(tParentValue) |
2315 tValue->SetValueL(tParentValue->Value()); |
2316 tValue->SetValueL(tParentValue->Value()); |
2316 } |
2317 } |
2317 else |
2318 else |
2318 { |
2319 { |
2319 tValue->SetValueL( aValue ); |
2320 tValue->SetValueL( aValue ); |
2320 } |
2321 } |