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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 9a7a41f0d5db..b754dd35d362 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -28,7 +28,6 @@ #include <tools/time.hxx> #include <comphelper/solarmutex.hxx> #include <o3tl/char16_t2wchar_t.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/inputtypes.hxx> #include <vcl/opengl/OpenGLHelper.hxx> @@ -389,7 +388,7 @@ VCLPLUG_WIN_PUBLIC SalInstance* create_SalInstance() } WinSalInstance::WinSalInstance() - : SalInstance(o3tl::make_unique<SalYieldMutex>()) + : SalInstance(std::make_unique<SalYieldMutex>()) , mhInst( nullptr ) , mhComWnd( nullptr ) , m_nNoYieldLock( 0 ) diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 9b63fc583516..9be60fcac64e 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -24,7 +24,6 @@ #include <comphelper/windowserrorstring.hxx> #include <comphelper/scopeguard.hxx> -#include <o3tl/make_unique.hxx> #include <opengl/texture.hxx> #include <opengl/win/gdiimpl.hxx> @@ -295,7 +294,7 @@ std::unique_ptr<GenericSalLayout> WinSalGraphics::GetTextLayout(int nFallbackLev assert(mpWinFontEntry[nFallbackLevel]->GetFontFace()); mpWinFontEntry[nFallbackLevel]->SetGraphics(this); - return o3tl::make_unique<GenericSalLayout>(*mpWinFontEntry[nFallbackLevel]); + return std::make_unique<GenericSalLayout>(*mpWinFontEntry[nFallbackLevel]); } WinFontInstance::WinFontInstance(const WinFontFace& rPFF, const FontSelectPattern& rFSP) |