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/svdraw/svdmrkv.cxx | |
| 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/svdraw/svdmrkv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index a44c508f390c..d4f0448baf0b 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -57,7 +57,6 @@ #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> #include <sfx2/viewsh.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -829,53 +828,53 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) if (bWdt0 && bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); } else if (!bStdDrag && (bWdt0 || bHgt0)) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); } else { if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); } if (!bLimitedRotation && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopCenter(), SdrHdlKind::Upper)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopCenter(), SdrHdlKind::Upper)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopRight(), SdrHdlKind::UpperRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopRight(), SdrHdlKind::UpperRight)); } if (!bLimitedRotation && !bWdt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.LeftCenter(), SdrHdlKind::Left )); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.LeftCenter(), SdrHdlKind::Left )); } if (!bLimitedRotation && !bWdt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.RightCenter(), SdrHdlKind::Right)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.RightCenter(), SdrHdlKind::Right)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomLeft(), SdrHdlKind::LowerLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomLeft(), SdrHdlKind::LowerLeft)); } if (!bLimitedRotation && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomCenter(), SdrHdlKind::Lower)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomCenter(), SdrHdlKind::Lower)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); } } } @@ -1050,7 +1049,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SdrDragMode::Rotate: { // add rotation center - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(maRef1, SdrHdlKind::Ref1)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(maRef1, SdrHdlKind::Ref1)); break; } case SdrDragMode::Mirror: |