Kaydet (Commit) 99187570 authored tarafından David Tardon's avatar David Tardon

the var. must be persistent over multiple calls

Change-Id: Ieb48dfe85ed16a8123917b30873f301d523ea381
üst 485b1ac0
...@@ -153,6 +153,7 @@ SdXMLShapeContext::SdXMLShapeContext( ...@@ -153,6 +153,7 @@ SdXMLShapeContext::SdXMLShapeContext(
, maPosition(0, 0) , maPosition(0, 0)
, mbVisible(true) , mbVisible(true)
, mbPrintable(true) , mbPrintable(true)
, mbHaveXmlId(false)
{ {
} }
...@@ -782,7 +783,6 @@ void SdXMLShapeContext::SetThumbnail() ...@@ -782,7 +783,6 @@ void SdXMLShapeContext::SetThumbnail()
// this is called from the parent group for each unparsed attribute in the attribute list // 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 ) 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( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) )
{ {
if( IsXMLToken( rLocalName, XML_ZINDEX ) ) if( IsXMLToken( rLocalName, XML_ZINDEX ) )
...@@ -791,7 +791,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL ...@@ -791,7 +791,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
} }
else if( IsXMLToken( rLocalName, XML_ID ) ) else if( IsXMLToken( rLocalName, XML_ID ) )
{ {
if (!bHaveXmlId) { maShapeId = rValue; }; if (!mbHaveXmlId) { maShapeId = rValue; };
} }
else if( IsXMLToken( rLocalName, XML_NAME ) ) else if( IsXMLToken( rLocalName, XML_NAME ) )
{ {
...@@ -893,7 +893,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL ...@@ -893,7 +893,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
if( IsXMLToken( rLocalName, XML_ID ) ) if( IsXMLToken( rLocalName, XML_ID ) )
{ {
maShapeId = rValue; maShapeId = rValue;
bHaveXmlId = true; mbHaveXmlId = true;
} }
} }
} }
......
...@@ -78,6 +78,7 @@ protected: ...@@ -78,6 +78,7 @@ protected:
bool mbVisible; bool mbVisible;
bool mbPrintable; bool mbPrintable;
bool mbHaveXmlId;
/** if bSupportsStyle is false, auto styles will be set but not a style */ /** if bSupportsStyle is false, auto styles will be set but not a style */
void SetStyle( bool bSupportsStyle = true ); void SetStyle( bool bSupportsStyle = true );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment