diff options
Diffstat (limited to 'oox/source/drawingml/shape.cxx')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index b14cbef6ac15..eba300fc89d5 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1503,15 +1503,8 @@ void Shape::keepDiagramCompatibilityInfo() // We keep the previous items, if present if ( aGrabBag.hasElements() ) - { - sal_Int32 length = aGrabBag.getLength(); - aGrabBag.realloc( length+maDiagramDoms.getLength() ); - - for( sal_Int32 i = 0; i < maDiagramDoms.getLength(); ++i ) - aGrabBag[length+i] = maDiagramDoms[i]; - - xSet->setPropertyValue( aGrabBagPropName, Any( aGrabBag ) ); - } else + xSet->setPropertyValue( aGrabBagPropName, Any( comphelper::concatSequences(aGrabBag, maDiagramDoms) ) ); + else xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) ); } catch( const Exception& ) @@ -1771,20 +1764,21 @@ void Shape::putPropertiesToGrabBag( const Sequence< PropertyValue >& aProperties // get existing grab bag Sequence< PropertyValue > aGrabBag; xSet->getPropertyValue( aGrabBagPropName ) >>= aGrabBag; - sal_Int32 length = aGrabBag.getLength(); - // update grab bag size to contain the new items - aGrabBag.realloc( length + aProperties.getLength() ); + std::vector<PropertyValue> aVec; + aVec.reserve(aProperties.getLength()); // put the new items - for( sal_Int32 i=0; i < aProperties.getLength(); ++i ) - { - aGrabBag[length + i].Name = aProperties[i].Name; - aGrabBag[length + i].Value = aProperties[i].Value; - } + std::transform(aProperties.begin(), aProperties.end(), std::back_inserter(aVec), + [](const PropertyValue& rProp) { + PropertyValue aProp; + aProp.Name = rProp.Name; + aProp.Value = rProp.Value; + return aProp; + }); // put it back to the shape - xSet->setPropertyValue( aGrabBagPropName, Any( aGrabBag ) ); + xSet->setPropertyValue( aGrabBagPropName, Any( comphelper::concatSequences(aGrabBag, aVec) ) ); } } |