strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

we can std::move the data out of TextBreakupHelper

Browse source 
and save some copying

Change-Id: I34cbc2edfd53fcc440d1765dba471fcbb05b2b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135088
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-05-29 12:24:23 +02:00 committed by Noel Grandin
parent 1959d451da
commit d286a820fa
5 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drawinglayer/source/primitive2d/textbreakuphelper.cxx
View file

@ -261,14 +261,14 @@ namespace drawinglayer::primitive2d
mxResult = aTempResult;
}
const Primitive2DContainer& TextBreakupHelper::getResult(BreakupUnit aBreakupUnit) const
Primitive2DContainer TextBreakupHelper::extractResult(BreakupUnit aBreakupUnit)
{
if(mxResult.empty())
{
const_cast< TextBreakupHelper* >(this)->breakup(aBreakupUnit);
breakup(aBreakupUnit);
}
return mxResult;
return std::move(mxResult);
}
} // end of namespace

6
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
View file

@ -155,13 +155,13 @@ namespace drawinglayer::primitive2d
{
// support for single word mode; split to single word primitives
// using TextBreakupHelper
const TextBreakupHelper aTextBreakupHelper(*this);
const Primitive2DContainer& aBroken(aTextBreakupHelper.getResult(BreakupUnit::Word));
TextBreakupHelper aTextBreakupHelper(*this);
Primitive2DContainer aBroken(aTextBreakupHelper.extractResult(BreakupUnit::Word));
if(!aBroken.empty())
{
// was indeed split to several words, use as result
rContainer.insert(rContainer.end(), aBroken.begin(), aBroken.end());
rContainer.append(std::move(aBroken));
return;
}
else

2
include/drawinglayer/primitive2d/textbreakuphelper.hxx
View file

@ -66,7 +66,7 @@ namespace drawinglayer::primitive2d
virtual ~TextBreakupHelper();
/// get result
const Primitive2DContainer& getResult(BreakupUnit aBreakupUnit = BreakupUnit::Character) const;
Primitive2DContainer extractResult(BreakupUnit aBreakupUnit = BreakupUnit::Character);
};
} // end of namespace drawinglayer::primitive2d

7
svgio/source/svgreader/svgcharacternode.cxx
View file

@ -515,13 +515,12 @@ namespace svgio::svgreader
if(pCandidate)
{
const localTextBreakupHelper alocalTextBreakupHelper(*pCandidate, rSvgTextPosition);
const Primitive2DContainer& aResult(
alocalTextBreakupHelper.getResult());
localTextBreakupHelper alocalTextBreakupHelper(*pCandidate, rSvgTextPosition);
Primitive2DContainer aResult = alocalTextBreakupHelper.extractResult();
if(!aResult.empty())
{
rTarget.append(aResult);
rTarget.append(std::move(aResult));
}
// also consume for the implied single space

8
svgio/source/svgreader/svgtextpathnode.cxx
View file

@ -412,19 +412,19 @@ namespace svgio::svgreader
if(pCandidate)
{
const pathTextBreakupHelper aPathTextBreakupHelper(
pathTextBreakupHelper aPathTextBreakupHelper(
*pCandidate,
aPolygon,
fBasegfxPathLength,
fPosition,
rTextStart);
const drawinglayer::primitive2d::Primitive2DContainer& aResult(
aPathTextBreakupHelper.getResult());
drawinglayer::primitive2d::Primitive2DContainer aResult =
aPathTextBreakupHelper.extractResult();
if(!aResult.empty())
{
rTarget.append(aResult);
rTarget.append(std::move(aResult));
}
// advance position to consumed