diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-05-29 12:29:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-29 19:28:31 +0200 |
| commit | 7088b6c6c191a105426fc631c9bf95a17e9f02dd (patch) | |
| tree | b84999d2264942b6de667e1ee5c52ac9e2ddeecf /drawinglayer | |
| parent | d286a820fac4dbac993e13afda52dde79b310af4 (diff) | |
use Primitive2DContainer in TargetHolder
which we can std::move the data around, instead of copying
Change-Id: Id7aaad3970b942599807b7fda73d028f082a0f38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135089
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/inc/wmfemfhelper.hxx | 2 | ||||
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx index 39cd9b7b0777..01449ae2b1da 100644 --- a/drawinglayer/inc/wmfemfhelper.hxx +++ b/drawinglayer/inc/wmfemfhelper.hxx @@ -43,7 +43,7 @@ namespace wmfemfhelper class TargetHolder { private: - std::vector< rtl::Reference<drawinglayer::primitive2d::BasePrimitive2D> > aTargets; + drawinglayer::primitive2d::Primitive2DContainer aTargets; public: TargetHolder(); diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 1f5b8a10fcf2..0e8668e80656 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -333,15 +333,8 @@ namespace wmfemfhelper drawinglayer::primitive2d::Primitive2DContainer TargetHolder::getPrimitive2DSequence(const PropertyHolder& rPropertyHolder) { - const sal_uInt32 nCount(aTargets.size()); - drawinglayer::primitive2d::Primitive2DContainer xRetval(nCount); + drawinglayer::primitive2d::Primitive2DContainer xRetval = std::move(aTargets); - for (sal_uInt32 a(0); a < nCount; a++) - { - xRetval[a] = aTargets[a].get(); - } - // Since we have released them from the list - aTargets.clear(); if (!xRetval.empty() && rPropertyHolder.getClipPolyPolygonActive()) { |