diff options
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 74bb00ccfbe7..6a8c77a39b66 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3832,22 +3832,38 @@ void SdXMLCustomShapeContext::EndElement() if(bFlippedX || bFlippedY) { - beans::PropertyValue aNewPoroperty; + OUString sName; if(bFlippedX) + sName = "MirroredX"; + else + sName = "MirroredY"; + + //fdo#84043 overwrite the property if it already exists, otherwise append it + beans::PropertyValue* pItem; + std::vector< beans::PropertyValue >::iterator aI(maCustomShapeGeometry.begin()); + std::vector< beans::PropertyValue >::iterator aE(maCustomShapeGeometry.end()); + while (aI != aE) + { + if (aI->Name == sName) + break; + ++aI; + } + if (aI != aE) { - aNewPoroperty.Name = "MirroredX"; + beans::PropertyValue& rItem = *aI; + pItem = &rItem; } else { - aNewPoroperty.Name = "MirroredY"; + maCustomShapeGeometry.push_back(beans::PropertyValue()); + pItem = &maCustomShapeGeometry.back(); } - aNewPoroperty.Handle = -1; - aNewPoroperty.Value <<= sal_True; - aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE; - - maCustomShapeGeometry.push_back(aNewPoroperty); + pItem->Name = sName; + pItem->Handle = -1; + pItem->Value <<= sal_True; + pItem->State = beans::PropertyState_DIRECT_VALUE; } } |