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/unx/generic | |
| 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/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 2fa82c352cda..872f15405e31 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -35,7 +35,6 @@ #include <unx/helper.hxx> #include <vcl/inputtypes.hxx> -#include <o3tl/make_unique.hxx> #include <salwtype.hxx> #include <sal/macros.h> @@ -55,7 +54,7 @@ extern "C" if( ! ( pNoXInitThreads && *pNoXInitThreads ) ) XInitThreads(); - X11SalInstance* pInstance = new X11SalInstance( o3tl::make_unique<SalYieldMutex>() ); + X11SalInstance* pInstance = new X11SalInstance( std::make_unique<SalYieldMutex>() ); // initialize SalData X11SalData *pSalData = new X11SalData( SAL_DATA_UNX, pInstance ); diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 30ec4d19f7e0..2c368e6a765e 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -40,7 +40,6 @@ #include <cairo.h> #include <cairo-ft.h> #include <sallayout.hxx> -#include <o3tl/make_unique.hxx> namespace { @@ -447,7 +446,7 @@ std::unique_ptr<GenericSalLayout> CairoTextRender::GetTextLayout(int nFallbackLe assert(mpFreetypeFont[nFallbackLevel]); if (!mpFreetypeFont[nFallbackLevel]) return nullptr; - return o3tl::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]->GetFontInstance()); + return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]->GetFontInstance()); } #if ENABLE_CAIRO_CANVAS diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 46e0fcbdf7f0..a162a694f818 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -32,7 +32,6 @@ #include <salinst.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <opengl/x11/salvd.hxx> @@ -50,7 +49,7 @@ std::unique_ptr<SalVirtualDevice> X11SalInstance::CreateX11VirtualDevice(SalGrap std::unique_ptr<SalVirtualDevice> X11SalInstance::CreateVirtualDevice(SalGraphics* pGraphics, long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData) { - return CreateX11VirtualDevice(pGraphics, nDX, nDY, eFormat, pData, o3tl::make_unique<X11SalGraphics>()); + return CreateX11VirtualDevice(pGraphics, nDX, nDY, eFormat, pData, std::make_unique<X11SalGraphics>()); } void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap, diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 59f62c00c57a..2ca4426d7034 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -55,7 +55,6 @@ #include <salbmp.hxx> #include <salprn.hxx> #include <sallayout.hxx> -#include <o3tl/make_unique.hxx> using namespace psp; @@ -738,7 +737,7 @@ std::unique_ptr<GenericSalLayout> GenPspGraphics::GetTextLayout(int nFallbackLev assert(m_pFreetypeFont[nFallbackLevel]); if (!m_pFreetypeFont[nFallbackLevel]) return nullptr; - return o3tl::make_unique<PspSalLayout>(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]); + return std::make_unique<PspSalLayout>(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]); } bool GenPspGraphics::CreateFontSubset( |