diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-26 11:13:50 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-26 12:30:54 +0000 |
| commit | 6cc9f9106ddea2c1e69ee6a1f7a1b64a19a0d0ba (patch) | |
| tree | ae79af746ed80fce678b99210fa5d4cff478b101 /writerfilter | |
| parent | d311260c0d347b3c933706b8cac48b82a653e1c7 (diff) | |
DomainMapper_Impl::finishParagraph: refactor to avoid manual realloc
Change-Id: Ia52a2e3d6d98cfcc33a307ddcfc218a8426058dd
Reviewed-on: https://gerrit.libreoffice.org/15538
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 48ad8a2fa8e4..5188ca444b2e 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1118,24 +1118,22 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) lcl_AddRangeAndStyle(pToBeSavedProperties, xTextAppend, pPropertyMap, rAppendContext); } } - uno::Sequence< beans::PropertyValue > aProperties; - if( pPropertyMap.get() ) - { - aProperties = pPropertyMap->GetPropertyValues(); - } + std::vector<beans::PropertyValue> aProperties; + if (pPropertyMap.get()) + aProperties = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(pPropertyMap->GetPropertyValues()); if( !bIsDropCap ) { if( aDrop.Lines > 1 ) { - sal_uInt32 nLength = aProperties.getLength(); - aProperties.realloc( nLength + 1 ); - aProperties[nLength].Value <<= aDrop; - aProperties[nLength].Name = rPropNameSupplier.GetName(PROP_DROP_CAP_FORMAT); + beans::PropertyValue aValue; + aValue.Name = rPropNameSupplier.GetName(PROP_DROP_CAP_FORMAT); + aValue.Value <<= aDrop; + aProperties.push_back(aValue); } uno::Reference< text::XTextRange > xTextRange; if (rAppendContext.xInsertPosition.is()) { - xTextRange = xTextAppend->finishParagraphInsert( aProperties, rAppendContext.xInsertPosition ); + xTextRange = xTextAppend->finishParagraphInsert( comphelper::containerToSequence(aProperties), rAppendContext.xInsertPosition ); rAppendContext.xCursor->gotoNextParagraph(false); if (rAppendContext.pLastParagraphProperties.get()) rAppendContext.pLastParagraphProperties->SetEndingRange(xTextRange->getEnd()); @@ -1154,7 +1152,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) appendTextPortion(sMarker, pEmpty); } - xTextRange = xTextAppend->finishParagraph( aProperties ); + xTextRange = xTextAppend->finishParagraph( comphelper::containerToSequence(aProperties) ); if (xCursor.is()) { |