diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 18:35:37 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-21 07:36:04 +0100 |
| commit | 979aed6b38f4963ea37c39de090d4487a12ba2ba (patch) | |
| tree | a5cf6cfe464f00f8654140a514e0f418210b6f69 /drawinglayer/source/processor2d | |
| parent | 3b16e997f69efe2e3f6cdf64fe8fb2727b6ebaa7 (diff) | |
o3tl::make_unique -> std::make_unique in dbaccess...framework
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/processor2d')
| -rw-r--r-- | drawinglayer/source/processor2d/processor2dtools.cxx | 5 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/processorfromoutputdevice.cxx | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx index 1149e5271b9e..aa672cde80d0 100644 --- a/drawinglayer/source/processor2d/processor2dtools.cxx +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <drawinglayer/processor2d/processor2dtools.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/gdimtf.hxx> #include "vclpixelprocessor2d.hxx" #include "vclmetafileprocessor2d.hxx" @@ -35,7 +34,7 @@ namespace drawinglayer const drawinglayer::geometry::ViewInformation2D& rViewInformation2D) { // create Pixel Vcl-Processor - return o3tl::make_unique<VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev); + return std::make_unique<VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev); } std::unique_ptr<BaseProcessor2D> createProcessor2DFromOutputDevice( @@ -48,7 +47,7 @@ namespace drawinglayer if(bOutputToRecordingMetaFile) { // create MetaFile Vcl-Processor and process - return o3tl::make_unique<VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev); + return std::make_unique<VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev); } else { diff --git a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx index ce81ce4b8f88..2f33b1bf0dec 100644 --- a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx +++ b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx @@ -26,7 +26,6 @@ #include "vclmetafileprocessor2d.hxx" #include "vclpixelprocessor2d.hxx" #include <vcl/window.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -44,12 +43,12 @@ namespace drawinglayer if(bOutputToRecordingMetaFile) { // create MetaFile Vcl-Processor and process - return o3tl::make_unique<drawinglayer::processor2d::VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev); + return std::make_unique<drawinglayer::processor2d::VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev); } else { // create Pixel Vcl-Processor - return o3tl::make_unique<drawinglayer::processor2d::VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev); + return std::make_unique<drawinglayer::processor2d::VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev); } } } // end of namespace processor2d |