diff -r db5c883ad1c5 -r 1902ade171ab svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp --- a/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp Tue Aug 31 16:06:58 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/src/Svgdecoder.cpp Wed Sep 01 12:20:46 2010 +0100 @@ -2511,20 +2511,30 @@ // --------------------------------------------------------------------------- TBool CSvgDecoder::DecodeIdAndXmlAttributeL(const TUint16 aName) { - TBool rVal = EFalse; + if (aName== KAtrId) { - rVal = iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC()); - CleanupStack::PopAndDestroy( 1 ); + iCurrentElement->SetIdandXmlbaseL( _L("id"), DecodeTDesCLC()); + CleanupStack::PopAndDestroy( 1 ); + return ETrue; } - else if (aName== KAtrXmlBase) + + if (aName== KAtrXmlBase) { - rVal = iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC()); - CleanupStack::PopAndDestroy( 1 ); + iCurrentElement->SetIdandXmlbaseL( _L("xml:base"), DecodeTDesCLC()); + CleanupStack::PopAndDestroy( 1 ); + return ETrue; } - return rVal; + + else + { + return EFalse; + } } + + + // -------------------------------------------------------------------------- // TBool CSvgDecoder::DecodeUriRefAttributeL(const TUint16 aName) // ---------------------------------------------------------------------------