diff options
author | David Tardon <dtardon@redhat.com> | 2013-05-03 09:37:11 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-05-03 10:22:42 +0200 |
commit | 9918757003ae043ad53a9c3fcea2733696f6eb5c (patch) | |
tree | 0c808add62b88320ccb5d982510aba0b7785f144 /xmloff | |
parent | 485b1ac04c567d9d11cd395cf0a62cc43cabd8ad (diff) |
the var. must be persistent over multiple calls
Change-Id: Ieb48dfe85ed16a8123917b30873f301d523ea381
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 4d6f0ebc0e76..9074b5959647 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -153,6 +153,7 @@ SdXMLShapeContext::SdXMLShapeContext( , maPosition(0, 0) , mbVisible(true) , mbPrintable(true) +, mbHaveXmlId(false) { } @@ -782,7 +783,6 @@ void SdXMLShapeContext::SetThumbnail() // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { - bool bHaveXmlId( false ); if( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) ) { if( IsXMLToken( rLocalName, XML_ZINDEX ) ) @@ -791,7 +791,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL } else if( IsXMLToken( rLocalName, XML_ID ) ) { - if (!bHaveXmlId) { maShapeId = rValue; }; + if (!mbHaveXmlId) { maShapeId = rValue; }; } else if( IsXMLToken( rLocalName, XML_NAME ) ) { @@ -893,7 +893,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL if( IsXMLToken( rLocalName, XML_ID ) ) { maShapeId = rValue; - bHaveXmlId = true; + mbHaveXmlId = true; } } } diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 951fe905c426..949c70b41a7f 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -78,6 +78,7 @@ protected: bool mbVisible; bool mbPrintable; + bool mbHaveXmlId; /** if bSupportsStyle is false, auto styles will be set but not a style */ void SetStyle( bool bSupportsStyle = true ); |