mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DomainMapper_Impl::finishParagraph: refactor to avoid manual realloc

Browse Source 
Change-Id: Ia52a2e3d6d98cfcc33a307ddcfc218a8426058dd
Reviewed-on: https://gerrit.libreoffice.org/15538
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna 2015-04-26 11:13:50 +02:00
parent d311260c0d
commit 6cc9f9106d
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View File

@ -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())
{