diff options
Diffstat (limited to 'drawinglayer/source/primitive2d/mediaprimitive2d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive2d/mediaprimitive2d.cxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 108f53bf1431..eb70c7602c8c 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -21,6 +21,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> +#include <utility> #include <vcl/GraphicObject.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -31,7 +32,7 @@ namespace drawinglayer::primitive2d { - void MediaPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const + Primitive2DReference MediaPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { Primitive2DContainer xRetval; xRetval.resize(1); @@ -82,25 +83,26 @@ namespace drawinglayer::primitive2d aTransform.translate(aDestRange.getMinX(), aDestRange.getMinY()); // add transform primitive - Primitive2DReference aScaled(new TransformPrimitive2D(aTransform, std::move(xRetval))); - xRetval = Primitive2DContainer { aScaled }; + xRetval = Primitive2DContainer { + new TransformPrimitive2D(aTransform, std::move(xRetval)) // Scaled + }; } } - rContainer.insert(rContainer.end(), xRetval.begin(), xRetval.end()); + return new GroupPrimitive2D(std::move(xRetval)); } MediaPrimitive2D::MediaPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, - const OUString& rURL, + basegfx::B2DHomMatrix aTransform, + OUString aURL, const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder, - const Graphic &rSnapshot) - : maTransform(rTransform), - maURL(rURL), + Graphic aSnapshot) + : maTransform(std::move(aTransform)), + maURL(std::move(aURL)), maBackgroundColor(rBackgroundColor), mnDiscreteBorder(nDiscreteBorder), - maSnapshot(rSnapshot) + maSnapshot(std::move(aSnapshot)) { } @@ -113,7 +115,8 @@ namespace drawinglayer::primitive2d return (getTransform() == rCompare.getTransform() && maURL == rCompare.maURL && getBackgroundColor() == rCompare.getBackgroundColor() - && getDiscreteBorder() == rCompare.getDiscreteBorder()); + && getDiscreteBorder() == rCompare.getDiscreteBorder() + && maSnapshot.IsNone() == rCompare.maSnapshot.IsNone()); } return false; |