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>

9 files changed, 16 insertions, 25 deletions

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 <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
-#include <o3tl/make_unique.hxx>
 
 
 // DrawContact section
 
 std::unique_ptr<sdr::contact::ViewContact> E3dCubeObj::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dCube>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dCube>(*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 <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
-#include <o3tl/make_unique.hxx>
 
 
 E3dDragMethod::E3dDragMethod (
@@ -162,7 +161,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
             if( bUndo )
             {
                 getSdrDragView().AddUndo(
-                    o3tl::make_unique<E3dRotateUndoAction>(
+                    std::make_unique<E3dRotateUndoAction>(
                         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 <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <o3tl/make_unique.hxx>
 
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dExtrudeObj::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dExtrude>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dExtrude>(*this);
 }
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dExtrudeObj::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dExtrudeProperties>(*this);
+    return std::make_unique<sdr::properties::E3dExtrudeProperties>(*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 <sal/config.h>
 
-#include <o3tl/make_unique.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -458,7 +457,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
     if(mpRemember2DAttributes)
         mpRemember2DAttributes->ClearItem();
     else
-        mpRemember2DAttributes = o3tl::make_unique<SfxItemSet>(*rAttrs.GetPool(),
+        mpRemember2DAttributes = std::make_unique<SfxItemSet>(*rAttrs.GetPool(),
             svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
             SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{});
 
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 <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <o3tl/make_unique.hxx>
 
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dLatheObj::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dLathe>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dLathe>(*this);
 }
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dLatheObj::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dLatheProperties>(*this);
+    return std::make_unique<sdr::properties::E3dLatheProperties>(*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 <com/sun/star/uno/Sequence.h>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/e3dsceneupdater.hxx>
-#include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dObject::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dProperties>(*this);
+    return std::make_unique<sdr::properties::E3dProperties>(*this);
 }
 
 E3dObject::E3dObject(SdrModel& rSdrModel)
@@ -489,7 +488,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dCompoundObject::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dCompoundProperties>(*this);
+    return std::make_unique<sdr::properties::E3dCompoundProperties>(*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<SdrHdl>(Point(basegfx::fround(aPos2D.getX()), basegfx::fround(aPos2D.getY())), SdrHdlKind::BezierWeight));
+                rHdlList.AddHdl(std::make_unique<SdrHdl>(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<E3dVolumeMarker>(aPolyPolygon));
+        rHdlList.AddHdl(std::make_unique<E3dVolumeMarker>(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 <sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
-#include <o3tl/make_unique.hxx>
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dPolygonObj::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dPolygon>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dPolygon>(*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 <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <svx/svdmodel.hxx>
-#include <o3tl/make_unique.hxx>
 
 
 class ImpRemap3DDepth
@@ -159,7 +158,7 @@ sal_uInt32 Imp3DDepthRemapper::RemapOrdNum(sal_uInt32 nOrdNum) const
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dScene::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dSceneProperties>(*this);
+    return std::make_unique<sdr::properties::E3dSceneProperties>(*this);
 }
 
 
@@ -167,7 +166,7 @@ std::unique_ptr<sdr::properties::BaseProperties> E3dScene::CreateObjectSpecificP
 
 std::unique_ptr<sdr::contact::ViewContact> E3dScene::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dScene>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dScene>(*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 <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dsphere.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
-#include <o3tl/make_unique.hxx>
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact()
 {
-    return o3tl::make_unique<sdr::contact::ViewContactOfE3dSphere>(*this);
+    return std::make_unique<sdr::contact::ViewContactOfE3dSphere>(*this);
 }
 
 std::unique_ptr<sdr::properties::BaseProperties> E3dSphereObj::CreateObjectSpecificProperties()
 {
-    return o3tl::make_unique<sdr::properties::E3dSphereProperties>(*this);
+    return std::make_unique<sdr::properties::E3dSphereProperties>(*this);
 }
 
 // Build Sphere from polygon facets in latitude and longitude