equal
deleted
inserted
replaced
2175 |
2175 |
2176 if( aNameId == KCSS_ATTR_FILL ) |
2176 if( aNameId == KCSS_ATTR_FILL ) |
2177 { |
2177 { |
2178 |
2178 |
2179 MGfxPaint* lPaintValue = (MGfxPaint *)((( CPaintCssValueImpl* )lCssValue)->Value()); |
2179 MGfxPaint* lPaintValue = (MGfxPaint *)((( CPaintCssValueImpl* )lCssValue)->Value()); |
|
2180 /* |
2180 if(lPaintValue && lPaintValue->GetColor()== KSvgCurrentColor) |
2181 if(lPaintValue && lPaintValue->GetColor()== KSvgCurrentColor) |
2181 { |
2182 { |
2182 lPaintValue = CurrentColor(); |
2183 lPaintValue = CurrentColor(); |
2183 aValue = lPaintValue->GetColor(); |
2184 aValue = lPaintValue->GetColor(); |
2184 } |
2185 } |
2185 else if(lPaintValue) |
2186 else*/ if(lPaintValue) |
2186 { |
2187 { |
2187 aValue = lPaintValue->GetColor(); |
2188 aValue = lPaintValue->GetColor(); |
2188 } |
2189 } |
2189 else |
2190 else |
2190 { |
2191 { |
2307 iSvgStyleProperties->operator[](aNameId) = tValue; |
2308 iSvgStyleProperties->operator[](aNameId) = tValue; |
2308 |
2309 |
2309 } |
2310 } |
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; |
|
2315 tValue->SetValueL(tParentValue->Value()); |
2314 } |
2316 } |
2315 else |
2317 else |
2316 { |
2318 { |
2317 tValue->SetValueL( aValue ); |
2319 tValue->SetValueL( aValue ); |
2318 } |
2320 } |