# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401620 -7200
# Node ID baacd33d915bffd576756a49159046a2d62fac6a
# Parent  19f463b3b9b26eb23e2d4708c69f8a6081ce62a0
Revision: 201007
Kit: 201008

diff -r 19f463b3b9b2 -r baacd33d915b svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp
--- a/svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp	Fri Feb 19 23:44:22 2010 +0200
+++ b/svgtopt/SVG/SVGImpl/src/SVGDocumentImpl.cpp	Fri Mar 12 15:47:00 2010 +0200
@@ -609,18 +609,19 @@
 // ==========================================================================
 TDesC* CSvgDocumentImpl::GetId(TInt index)
 {
+				TDesC* id = NULL;
         RPointerArray<TDesC> ids;
 
         FindAllIds( (CSvgElementImpl*)RootElement(), ids );
 
         if (index < ids.Count())
         {
-            return (ids[index]);
+            id = ids[index];
         }
 
         ids.Close();
 
-    return NULL;
+    return id;
 }
 
 // ==========================================================================
diff -r 19f463b3b9b2 -r baacd33d915b svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp
--- a/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp	Fri Feb 19 23:44:22 2010 +0200
+++ b/svgtopt/SVG/SVGImpl/src/SVGElementImpl.cpp	Fri Mar 12 15:47:00 2010 +0200
@@ -2177,12 +2177,13 @@
                 {
 
                 MGfxPaint* lPaintValue = (MGfxPaint *)((( CPaintCssValueImpl* )lCssValue)->Value());
+				/*
                 if(lPaintValue && lPaintValue->GetColor()== KSvgCurrentColor)
                     {
                     lPaintValue = CurrentColor();
                     aValue = lPaintValue->GetColor();                     
                     }
-                else if(lPaintValue)
+                else*/ if(lPaintValue)
                 	{
                 	aValue = lPaintValue->GetColor();
                 	}
@@ -2309,8 +2310,9 @@
                 }
             if( lParentElement && aValue == KInherit )    
             {
-            tParentValue  = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId));
-            (*iSvgStyleProperties)[aNameId]= tParentValue;
+            //tParentValue  = (CIntCssValueImpl *)(lParentElement->iSvgStyleProperties->operator[](aNameId));
+            //(*iSvgStyleProperties)[aNameId]= tParentValue;
+			 tValue->SetValueL(tParentValue->Value());
             }
             else
             {
diff -r 19f463b3b9b2 -r baacd33d915b svgtopt/SVGEngineJI/inc/SVGjsrconstants.h
--- a/svgtopt/SVGEngineJI/inc/SVGjsrconstants.h	Fri Feb 19 23:44:22 2010 +0200
+++ b/svgtopt/SVGEngineJI/inc/SVGjsrconstants.h	Fri Mar 12 15:47:00 2010 +0200
@@ -265,7 +265,6 @@
     #define TEXT_UNDER_LINE  363
     #define TEXT_OVER_LINE  364
     #define TEXT_LINE_THROUGH  365
-	#define ATTRIBUTE_INHERIT  -2
 
     // These are actual sizes in 8:8 fixed point, not "choices"
     #define FONT_SIZE_XXSMALL  0x20000
diff -r 19f463b3b9b2 -r baacd33d915b svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp
--- a/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp	Fri Feb 19 23:44:22 2010 +0200
+++ b/svgtopt/SVGEngineJI/src/SvgJavaInterfaceImpl.cpp	Fri Mar 12 15:47:00 2010 +0200
@@ -1257,15 +1257,17 @@
     ********************************************************/
     if(aElementHandle)
         {
-        TInt32 lValue = 0;
+        //TInt32 lValue = 0;
+        
         TInt lSvgAttrId = SvgGetAttributeTypeMappingJSRtoSVG(aAttribute);
         if(lSvgAttrId != KSvgUnknownAttribute)
             {
-
+			TInt lValue = SvgEnumerationMappingJSRtoSVG(lSvgAttrId , (TInt)aValue);
+			/*
             lValue = SvgEnumerationMappingJSRtoSVG(lSvgAttrId , (TInt)aValue);
             
             if ( lValue == KErrNotFound && aValue == ATTRIBUTE_INHERIT ) 
-                lValue = KSVGAttributeInherit;
+                lValue = KSVGAttributeInherit;*/
             if(lSvgAttrId == KCSS_ATTR_FONTSIZE)
                 {
                 if(lValue != KErrNotFound)
diff -r 19f463b3b9b2 -r baacd33d915b svgtopt/VGRenderer/SWVG/src/SWVGSurfaceImpl.cpp
--- a/svgtopt/VGRenderer/SWVG/src/SWVGSurfaceImpl.cpp	Fri Feb 19 23:44:22 2010 +0200
+++ b/svgtopt/VGRenderer/SWVG/src/SWVGSurfaceImpl.cpp	Fri Mar 12 15:47:00 2010 +0200
@@ -104,7 +104,7 @@
         ret = ::VGISymbianCopyToBitmap(aBitmap, aMask, VGI_COPY_TRANSPARENT_PIXELS);
         }
         
-    return KErrNone;
+    return ret;
     }
 
 TInt CSWVGSurfaceImpl::PrepareToBindClientBuffer()