From a2bd7470368b2a44edf25680bd250c4d2b7428cb Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 4 Feb 2019 19:43:45 +0100 Subject: 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 --- svx/source/engine3d/cube3d.cxx | 3 +-- svx/source/engine3d/dragmt3d.cxx | 3 +-- svx/source/engine3d/extrud3d.cxx | 5 ++--- svx/source/engine3d/float3d.cxx | 3 +-- svx/source/engine3d/lathe3d.cxx | 5 ++--- svx/source/engine3d/obj3d.cxx | 9 ++++----- svx/source/engine3d/polygn3d.cxx | 3 +-- svx/source/engine3d/scene3d.cxx | 5 ++--- svx/source/engine3d/sphere3d.cxx | 5 ++--- 9 files changed, 16 insertions(+), 25 deletions(-) (limited to 'svx/source/engine3d') diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index ecc3dc74abc8..048170d44413 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -25,14 +25,13 @@ #include #include #include -#include // DrawContact section std::unique_ptr E3dCubeObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 36971d34bf6d..533fec2227bd 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -33,7 +33,6 @@ #include #include #include -#include E3dDragMethod::E3dDragMethod ( @@ -162,7 +161,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) if( bUndo ) { getSdrDragView().AddUndo( - o3tl::make_unique( + std::make_unique( rCandidate.mr3DObj, rCandidate.maInitTransform, rCandidate.maTransform)); diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index fc20fc9fa342..05089abf073b 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -36,18 +36,17 @@ #include #include #include -#include // DrawContact section std::unique_ptr E3dExtrudeObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } std::unique_ptr E3dExtrudeObj::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } // Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 6451b1778893..816ac2919375 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -458,7 +457,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs ) if(mpRemember2DAttributes) mpRemember2DAttributes->ClearItem(); else - mpRemember2DAttributes = o3tl::make_unique(*rAttrs.GetPool(), + mpRemember2DAttributes = std::make_unique(*rAttrs.GetPool(), svl::Items{}); diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index e7ad61fb32a6..99d4eddeae15 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -34,18 +34,17 @@ #include #include #include -#include // DrawContact section std::unique_ptr E3dLatheObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } std::unique_ptr E3dLatheObj::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } // Constructor from 3D polygon, scale is the conversion factor for the coordinates diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index a7d6c5d05e59..297719c09435 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -75,13 +75,12 @@ #include #include #include -#include using namespace com::sun::star; std::unique_ptr E3dObject::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } E3dObject::E3dObject(SdrModel& rSdrModel) @@ -489,7 +488,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nAngle, double sn, double cs) std::unique_ptr E3dCompoundObject::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } E3dCompoundObject::E3dCompoundObject(SdrModel& rSdrModel) @@ -574,7 +573,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const // to 2d world coor aPos2D *= rVCScene.getObjectTransformation(); - rHdlList.AddHdl(o3tl::make_unique(Point(basegfx::fround(aPos2D.getX()), basegfx::fround(aPos2D.getY())), SdrHdlKind::BezierWeight)); + rHdlList.AddHdl(std::make_unique(Point(basegfx::fround(aPos2D.getX()), basegfx::fround(aPos2D.getY())), SdrHdlKind::BezierWeight)); } } } @@ -583,7 +582,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const if(aPolyPolygon.count()) { - rHdlList.AddHdl(o3tl::make_unique(aPolyPolygon)); + rHdlList.AddHdl(std::make_unique(aPolyPolygon)); } } diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index a94c316fe4bf..d5136106ab99 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -24,12 +24,11 @@ #include #include #include -#include // DrawContact section std::unique_ptr E3dPolygonObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } E3dPolygonObj::E3dPolygonObj( diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 45c9fbc8a5a1..db818000f152 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -46,7 +46,6 @@ #include #include #include -#include class ImpRemap3DDepth @@ -159,7 +158,7 @@ sal_uInt32 Imp3DDepthRemapper::RemapOrdNum(sal_uInt32 nOrdNum) const std::unique_ptr E3dScene::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } @@ -167,7 +166,7 @@ std::unique_ptr E3dScene::CreateObjectSpecificP std::unique_ptr E3dScene::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 4b2ee554aa10..ecd6b370c4d4 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -32,17 +32,16 @@ #include #include #include -#include // DrawContact section std::unique_ptr E3dSphereObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } std::unique_ptr E3dSphereObj::CreateObjectSpecificProperties() { - return o3tl::make_unique(*this); + return std::make_unique(*this); } // Build Sphere from polygon facets in latitude and longitude -- cgit