diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 19:43:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-12 14:59:17 +0100 |
| commit | a2bd7470368b2a44edf25680bd250c4d2b7428cb (patch) | |
| tree | 0907596b7ff56a2a892fe2c12bcbc89f8aea1995 /svx/source/sdr/primitive2d | |
| parent | db346dde6179e7414289681d91b153a6ed259d05 (diff) | |
o3tl::make_unique -> std::make_unique in svx/
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ic91b7170b10299001167e78ade1d24c16ce9319e
Reviewed-on: https://gerrit.libreoffice.org/67475
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/source/sdr/primitive2d')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 3 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index e46c426191af..e71fe38fd6dc 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -19,7 +19,6 @@ #include <sdr/primitive2d/sdrprimitivetools.hxx> #include <osl/mutex.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/lazydelete.hxx> #include <vcl/BitmapTools.hxx> @@ -57,7 +56,7 @@ namespace drawinglayer BitmapEx aBitmap = vcl::bitmap::CreateFromData(cross, 3, 3, 12, 32); // create and exchange at aRetVal - aRetVal.set(o3tl::make_unique<BitmapEx>(aBitmap)); + aRetVal.set(std::make_unique<BitmapEx>(aBitmap)); } return aRetVal.get() ? *aRetVal.get() : BitmapEx(); diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 805a65a676d6..00a5aa89c17c 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -31,7 +31,6 @@ #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -281,7 +280,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrContourTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrContourTextPrimitive2D>( + return std::make_unique<SdrContourTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), getUnitPolyPolygon(), @@ -336,7 +335,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aNewPolyPolygon(getPathPolyPolygon()); aNewPolyPolygon.transform(rTransform); - return o3tl::make_unique<SdrPathTextPrimitive2D>( + return std::make_unique<SdrPathTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), aNewPolyPolygon, @@ -406,7 +405,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrBlockTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrBlockTextPrimitive2D>( + return std::make_unique<SdrBlockTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), @@ -464,7 +463,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); + return std::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); } // provide unique ID @@ -508,7 +507,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrChainedTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform()); + return std::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform()); } // provide unique ID @@ -555,7 +554,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrStretchTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrStretchTextPrimitive2D>( + return std::make_unique<SdrStretchTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), |