diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 20:41:49 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-08 12:30:06 +0100 |
| commit | 43635b474cdce65e64fa9ca9d27a3cee6d96d50b (patch) | |
| tree | 04d4223ebf161e2dc83f0842a1a81cef76d784d6 /vcl/quartz | |
| parent | 2d6313a9fac81340883b24fe3651781d31c6039d (diff) | |
o3tl::make_unique -> std::make_unique in tools..xmloff
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib3201f865d43f372007cdf381c7e244e9cbeae26
Reviewed-on: https://gerrit.libreoffice.org/67474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/salbmp.cxx | 13 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index f008b02a004e..3d7af959b90d 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -25,7 +25,6 @@ #include <limits> #include <o3tl/make_shared.hxx> -#include <o3tl/make_unique.hxx> #include <basegfx/vector/b2ivector.hxx> #include <tools/color.hxx> #include <vcl/bitmap.hxx> @@ -539,12 +538,12 @@ std::unique_ptr<ImplPixelFormat> ImplPixelFormat::GetFormat( sal_uInt16 nBits, c { switch( nBits ) { - case 1: return o3tl::make_unique<ImplPixelFormat1>( rPalette ); - case 4: return o3tl::make_unique<ImplPixelFormat4>( rPalette ); - case 8: return o3tl::make_unique<ImplPixelFormat8>( rPalette ); - case 16: return o3tl::make_unique<ImplPixelFormat16>(); - case 24: return o3tl::make_unique<ImplPixelFormat24>(); - case 32: return o3tl::make_unique<ImplPixelFormat32>(); + case 1: return std::make_unique<ImplPixelFormat1>( rPalette ); + case 4: return std::make_unique<ImplPixelFormat4>( rPalette ); + case 8: return std::make_unique<ImplPixelFormat8>( rPalette ); + case 16: return std::make_unique<ImplPixelFormat16>(); + case 24: return std::make_unique<ImplPixelFormat24>(); + case 32: return std::make_unique<ImplPixelFormat32>(); default: assert(false); return nullptr; diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 1331c229166e..379174690968 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drectangle.hxx> -#include <o3tl/make_unique.hxx> #include <osl/file.hxx> #include <osl/process.h> #include <rtl/bootstrap.h> @@ -508,7 +507,7 @@ std::unique_ptr<GenericSalLayout> AquaSalGraphics::GetTextLayout(int nFallbackLe assert(mpTextStyle[nFallbackLevel]); if (!mpTextStyle[nFallbackLevel]) return nullptr; - return o3tl::make_unique<GenericSalLayout>(*mpTextStyle[nFallbackLevel]); + return std::make_unique<GenericSalLayout>(*mpTextStyle[nFallbackLevel]); } const FontCharMapRef AquaSalGraphics::GetFontCharMap() const |