From e48e063254caa7eb26b5c3c50fd64236d59ed553 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sun, 13 Jan 2019 15:13:32 +0100
Subject: o3tl::make_unique -> std::make_unique in basctl...bridges

Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one

Change-Id: I9a20a58c68d12656359dcaa060d8ab41f621af32
Reviewed-on: https://gerrit.libreoffice.org/66262
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 basic/source/sbx/sbxbase.cxx | 3 +--
 basic/source/sbx/sbxscan.cxx | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'basic/source/sbx')

diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 5b68b90e32ec..6090643955d0 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <o3tl/make_unique.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
@@ -280,7 +279,7 @@ SbxInfo::~SbxInfo()
 
 void SbxInfo::AddParam(const OUString& rName, SbxDataType eType, SbxFlagBits nFlags)
 {
-    m_Params.push_back(o3tl::make_unique<SbxParamInfo>(rName, eType, nFlags));
+    m_Params.push_back(std::make_unique<SbxParamInfo>(rName, eType, nFlags));
 }
 
 const SbxParamInfo* SbxInfo::GetParam( sal_uInt16 n ) const
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6b785b3fdca8..f0c75478c6a5 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -50,8 +50,6 @@
 #include <sal/log.hxx>
 #include <svl/zforlist.hxx>
 
-#include <o3tl/make_unique.hxx>
-
 
 void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep, sal_Unicode& rcDecimalSepAlt )
 {
@@ -858,7 +856,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
                 OUString aFalseStrg = BasResId(STR_BASICKEY_FORMAT_FALSE);
                 OUString aCurrencyFormatStrg = BasResId(STR_BASICKEY_FORMAT_CURRENCY);
 
-                rAppData.pBasicFormater = o3tl::make_unique<SbxBasicFormater>(
+                rAppData.pBasicFormater = std::make_unique<SbxBasicFormater>(
                                                                 cComma,c1000,aOnStrg,aOffStrg,
                                                                 aYesStrg,aNoStrg,aTrueStrg,aFalseStrg,
                                                                 aCurrencyStrg,aCurrencyFormatStrg );
-- 
cgit