--- a/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp	Tue May 11 17:02:26 2010 +0300
+++ b/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp	Tue Aug 31 16:06:58 2010 +0300
@@ -2511,30 +2511,20 @@
 // ---------------------------------------------------------------------------
 TBool CSvgDecoder::DecodeIdAndXmlAttributeL(const TUint16 aName)
 	{
-
+    TBool rVal = EFalse;
 	if (aName== KAtrId)
 		{
-		iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC());
-		 CleanupStack::PopAndDestroy( 1 );
-		return ETrue;
+		rVal = iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC());
+		CleanupStack::PopAndDestroy( 1 );
 		}
-
-	if (aName== KAtrXmlBase)
+	else if (aName== KAtrXmlBase)
 		{
-		iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC());
-		 CleanupStack::PopAndDestroy( 1 );
-		return ETrue;
+		rVal = iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC());
+		CleanupStack::PopAndDestroy( 1 );
 		}
-
-	else
-		{
-		return EFalse;
-		}
+	return rVal;
 	}
 
-
-
-
 // --------------------------------------------------------------------------
 // TBool CSvgDecoder::DecodeUriRefAttributeL(const TUint16 aName)
 // ---------------------------------------------------------------------------