From 43635b474cdce65e64fa9ca9d27a3cee6d96d50b Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Mon, 4 Feb 2019 20:41:49 +0100
Subject: 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>
---
 vcl/opengl/FixedTextureAtlas.cxx |  4 +---
 vcl/opengl/salbmp.cxx            | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'vcl/opengl')

diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx
index a81a4c113054..77c659f2bec6 100644
--- a/vcl/opengl/FixedTextureAtlas.cxx
+++ b/vcl/opengl/FixedTextureAtlas.cxx
@@ -18,8 +18,6 @@
 
 #include <opengl/FixedTextureAtlas.hxx>
 
-#include <o3tl/make_unique.hxx>
-
 struct FixedTexture
 {
     std::shared_ptr<ImplOpenGLTexture> mpTexture;
@@ -90,7 +88,7 @@ void FixedTextureAtlasManager::CreateNewTexture()
 {
     int nTextureWidth = mWidthFactor  * mSubTextureSize;
     int nTextureHeight = mHeightFactor * mSubTextureSize;
-    maFixedTextures.push_back(o3tl::make_unique<FixedTexture>(nTextureWidth, nTextureHeight, mWidthFactor * mHeightFactor));
+    maFixedTextures.push_back(std::make_unique<FixedTexture>(nTextureWidth, nTextureHeight, mWidthFactor * mHeightFactor));
 }
 
 OpenGLTexture FixedTextureAtlasManager::Reserve(int nWidth, int nHeight)
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 4fa46de7649e..8e2eed0479ec 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -34,7 +34,6 @@
 #include <vcleventlisteners.hxx>
 #include <vcl/lazydelete.hxx>
 
-#include <o3tl/make_unique.hxx>
 #include <o3tl/make_shared.hxx>
 
 #include <opengl/zone.hxx>
@@ -414,11 +413,11 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const int
         TextureAtlasVector &sTextureAtlases = *gTextureAtlases.get();
         if (sTextureAtlases.empty())
         {
-            sTextureAtlases.push_back(o3tl::make_unique<FixedTextureAtlasManager>(8, 8, 16));
-            sTextureAtlases.push_back(o3tl::make_unique<FixedTextureAtlasManager>(8, 8, 24));
-            sTextureAtlases.push_back(o3tl::make_unique<FixedTextureAtlasManager>(8, 8, 32));
-            sTextureAtlases.push_back(o3tl::make_unique<FixedTextureAtlasManager>(8, 8, 48));
-            sTextureAtlases.push_back(o3tl::make_unique<FixedTextureAtlasManager>(8, 8, 64));
+            sTextureAtlases.push_back(std::make_unique<FixedTextureAtlasManager>(8, 8, 16));
+            sTextureAtlases.push_back(std::make_unique<FixedTextureAtlasManager>(8, 8, 24));
+            sTextureAtlases.push_back(std::make_unique<FixedTextureAtlasManager>(8, 8, 32));
+            sTextureAtlases.push_back(std::make_unique<FixedTextureAtlasManager>(8, 8, 48));
+            sTextureAtlases.push_back(std::make_unique<FixedTextureAtlasManager>(8, 8, 64));
         }
         for (std::unique_ptr<FixedTextureAtlasManager> & pTextureAtlas : sTextureAtlases)
         {
-- 
cgit