o3tl::make_unique -> std::make_unique in chart2...cui

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

Change-Id: I2ba0b9b44971166bd79527b52745f3c40dc14387
Reviewed-on: https://gerrit.libreoffice.org/66490
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 12 insertions, 19 deletions

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index b48359afdde1..f799388c727b 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -37,7 +37,6 @@
 #include <dbase/DResultSet.hxx>
 #include <strings.hrc>
 #include <unotools/sharedunocomponent.hxx>
-#include <o3tl/make_unique.hxx>
 
 using namespace ::comphelper;
 
@@ -163,7 +162,7 @@ void ODbaseIndex::openIndexFile()
 std::unique_ptr<OIndexIterator> ODbaseIndex::createIterator()
 {
     openIndexFile();
-    return o3tl::make_unique<OIndexIterator>(this);
+    return std::make_unique<OIndexIterator>(this);
 }
 
 bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index c48073ed2a41..f071b4b66d51 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -40,7 +40,6 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlerror.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <o3tl/make_unique.hxx>
 #include <rtl/string.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
@@ -628,11 +627,11 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pCo
     ,m_nLength(0)
 {
     if (eds_check_version( 3, 7, 6 ) == nullptr)
-        m_pVersionHelper  = o3tl::make_unique<OEvoabVersion38Helper>();
+        m_pVersionHelper  = std::make_unique<OEvoabVersion38Helper>();
     else if (eds_check_version( 3, 6, 0 ) == nullptr)
-        m_pVersionHelper  = o3tl::make_unique<OEvoabVersion36Helper>();
+        m_pVersionHelper  = std::make_unique<OEvoabVersion36Helper>();
     else
-        m_pVersionHelper  = o3tl::make_unique<OEvoabVersion35Helper>();
+        m_pVersionHelper  = std::make_unique<OEvoabVersion35Helper>();
 
     #define REGISTER_PROP( id, member ) \
         registerProperty( \
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 8c37dd7fa147..dc83d9c3dec8 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <connectivity/dbconversion.hxx>
-#include <o3tl/make_unique.hxx>
 
 using namespace connectivity::macab;
 using namespace com::sun::star::sdbc;
@@ -37,7 +36,7 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields)
 {
     sal_Int32 i;
     size = _size;
-    fields = o3tl::make_unique<macabfield *[]>(size);
+    fields = std::make_unique<macabfield *[]>(size);
     for(i = 0; i < size; i++)
     {
         if(_fields[i] == nullptr)
@@ -87,7 +86,7 @@ void MacabHeader::operator+= (const MacabHeader *r)
         {
             sal_Int32 i;
             size = rSize;
-            fields = o3tl::make_unique<macabfield *[]>(size);
+            fields = std::make_unique<macabfield *[]>(size);
             for(i = 0; i < size; i++)
             {
                 fields[i] = r->copy(i);
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index 89a5094c48e0..5d95e320ef20 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -21,7 +21,6 @@
 #include "MacabRecord.hxx"
 #include "macabutilities.hxx"
 #include <com/sun/star/util/DateTime.hpp>
-#include <o3tl/make_unique.hxx>
 
 #include <premac.h>
 #include <Carbon/Carbon.h>
@@ -43,7 +42,7 @@ MacabRecord::MacabRecord()
 MacabRecord::MacabRecord(const sal_Int32 _size)
 {
     size = _size;
-    fields = o3tl::make_unique<macabfield *[]>(size);
+    fields = std::make_unique<macabfield *[]>(size);
     sal_Int32 i;
     for(i = 0; i < size; i++)
         fields[i] = nullptr;
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 19fa868a2b28..58695a8701ff 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -33,7 +33,6 @@
 #include <AddressBook/ABAddressBookC.h>
 #include <postmac.h>
 #include <com/sun/star/util/DateTime.hpp>
-#include <o3tl/make_unique.hxx>
 
 using namespace connectivity::macab;
 using namespace com::sun::star::util;
@@ -635,12 +634,12 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                         multiLabel = OUStringToCFString(multiLabelString);
                         hdr.reset(createHeaderForProperty(multiType, multiValue, multiLabel));
                         if (!hdr)
-                            hdr = o3tl::make_unique<MacabHeader>();
+                            hdr = std::make_unique<MacabHeader>();
                         multiLengthSecondLevel += hdr->getSize();
                     }
                     else
                     {
-                        hdr = o3tl::make_unique<MacabHeader>();
+                        hdr = std::make_unique<MacabHeader>();
                     }
                     if(multiValue)
                         CFRelease(multiValue);
@@ -785,7 +784,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                     arrLabel = OUStringToCFString(arrLabelString);
                     auto hdr = std::unique_ptr<MacabHeader>(createHeaderForProperty(arrType, arrValue, arrLabel));
                     if (!hdr)
-                        hdr = o3tl::make_unique<MacabHeader>();
+                        hdr = std::make_unique<MacabHeader>();
                     length += hdr->getSize();
                     CFRelease(arrLabel);
                     arrHeaders.push_back(std::move(hdr));
diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx
index 0baa759da14c..87978f592fe9 100644
--- a/connectivity/source/drivers/writer/WCatalog.cxx
+++ b/connectivity/source/drivers/writer/WCatalog.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <o3tl/make_unique.hxx>
 
 #include <writer/WConnection.hxx>
 
@@ -55,7 +54,7 @@ void OWriterCatalog::refreshTables()
     if (m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables = o3tl::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector);
+        m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector);
 }
 
 } // namespace writer
diff --git a/connectivity/source/inc/writer/WConnection.hxx b/connectivity/source/inc/writer/WConnection.hxx
index 7fdbdfa13310..5b3eae535e18 100644
--- a/connectivity/source/inc/writer/WConnection.hxx
+++ b/connectivity/source/inc/writer/WConnection.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <unotools/closeveto.hxx>
-#include <o3tl/make_unique.hxx>
 
 namespace com
 {
@@ -81,7 +80,7 @@ class OWriterConnection : public file::OConnection
         {
             m_xDesktop = rDesktop;
             m_xDesktop->addTerminateListener(this);
-            m_pCloseListener = o3tl::make_unique<utl::CloseVeto>(rCloseable, true);
+            m_pCloseListener = std::make_unique<utl::CloseVeto>(rCloseable, true);
         }
 
         void stop()