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>

5 files changed, 24 insertions, 29 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 47437d07779a..2c3b621a734a 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <o3tl/make_unique.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/objface.hxx>
@@ -63,7 +62,7 @@ DocShell::~DocShell()
 SfxPrinter* DocShell::GetPrinter( bool bCreate )
 {
     if ( !pPrinter && bCreate )
-        pPrinter.disposeAndReset(VclPtr<SfxPrinter>::Create(o3tl::make_unique<SfxItemSet>(
+        pPrinter.disposeAndReset(VclPtr<SfxPrinter>::Create(std::make_unique<SfxItemSet>(
             GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN>{}
         )));
 
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 39ab977d58dd..7e1380f9d7ed 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -23,7 +23,6 @@
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <iderid.hxx>
-#include <o3tl/make_unique.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
@@ -212,7 +211,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
         AddEntry(
             aRootName,
             aImage,
-            nullptr, true, o3tl::make_unique<DocumentEntry>(rDocument, eLocation));
+            nullptr, true, std::make_unique<DocumentEntry>(rDocument, eLocation));
     }
 
     SetUpdateMode(true);
@@ -274,7 +273,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
                     aLibName,
                     Image(StockImage::Yes, sId),
                     pDocumentRootEntry, true,
-                    o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
+                    std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
             }
         }
     }
@@ -310,7 +309,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
                                 aModName,
                                 Image(StockImage::Yes, RID_BMP_MODULE),
                                 pLibRootEntry, false,
-                                o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                                std::make_unique<Entry>(OBJ_TYPE_MODULE));
                         }
 
                         // methods
@@ -373,7 +372,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr
             AddEntry(
                 aEntryName,
                 Image(StockImage::Yes, RID_BMP_MODLIB),
-                pLibRootEntry, true, o3tl::make_unique<Entry>(eType));
+                pLibRootEntry, true, std::make_unique<Entry>(eType));
         }
     }
 }
@@ -435,7 +434,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
                     aEntryName,
                     Image(StockImage::Yes, RID_BMP_MODULE),
                     pLibSubRootEntry, false,
-                    o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                    std::make_unique<Entry>(OBJ_TYPE_MODULE));
             }
 
             // methods
@@ -639,7 +638,7 @@ void TreeListBox::FillTreeListBox( SvTreeListEntry* pRootEntry, const Sequence<
                 aName,
                 Image(StockImage::Yes, aBmpMacro),
                 pRootEntry, false,
-                o3tl::make_unique<Entry>( eType ));
+                std::make_unique<Entry>( eType ));
         }
     }
 }
@@ -913,7 +912,7 @@ void SbTreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation
     {
         OUString aRootName(GetRootEntryName(rDocument, eLocation));
         OUString aImage(GetRootEntryBitmaps(rDocument));
-        AddEntry(aRootName, aImage, nullptr, true, o3tl::make_unique<DocumentEntry>(rDocument, eLocation));
+        AddEntry(aRootName, aImage, nullptr, true, std::make_unique<DocumentEntry>(rDocument, eLocation));
     }
     m_xControl->thaw();
 }
@@ -971,7 +970,7 @@ void SbTreeListBox::ImpCreateLibEntries(weld::TreeIter& rIter, const ScriptDocum
             }
             else
             {
-                AddEntry(aLibName, sId, &rIter, true, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
+                AddEntry(aLibName, sId, &rIter, true, std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
             }
         }
     }
@@ -1008,7 +1007,7 @@ void SbTreeListBox::ImpCreateLibSubEntries(weld::TreeIter& rLibRootEntry, const
                         bool bModuleEntry = FindEntry(aModName, OBJ_TYPE_MODULE, *xTreeIter);
                         if (!bModuleEntry)
                         {
-                            AddEntry(aModName, RID_BMP_MODULE, &rLibRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                            AddEntry(aModName, RID_BMP_MODULE, &rLibRootEntry, false, std::make_unique<Entry>(OBJ_TYPE_MODULE));
                         }
 
                         // methods
@@ -1027,7 +1026,7 @@ void SbTreeListBox::ImpCreateLibSubEntries(weld::TreeIter& rLibRootEntry, const
                                 bool bEntry = FindEntry(aName, OBJ_TYPE_METHOD, *xSubTreeIter);
                                 if (!bEntry)
                                 {
-                                    AddEntry(aName, RID_BMP_MACRO, xTreeIter.get(), false, o3tl::make_unique<Entry>(OBJ_TYPE_METHOD));
+                                    AddEntry(aName, RID_BMP_MACRO, xTreeIter.get(), false, std::make_unique<Entry>(OBJ_TYPE_METHOD));
                                 }
                             }
                         }
@@ -1064,7 +1063,7 @@ void SbTreeListBox::ImpCreateLibSubEntries(weld::TreeIter& rLibRootEntry, const
                     bool bDialogEntry = FindEntry(aDlgName, OBJ_TYPE_DIALOG, *xTreeIter);
                     if (!bDialogEntry)
                     {
-                        AddEntry(aDlgName, RID_BMP_DIALOG, &rLibRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG));
+                        AddEntry(aDlgName, RID_BMP_DIALOG, &rLibRootEntry, false, std::make_unique<Entry>(OBJ_TYPE_DIALOG));
                     }
                 }
             }
@@ -1098,7 +1097,7 @@ void SbTreeListBox::ImpCreateLibSubEntriesInVBAMode(weld::TreeIter& rLibRootEntr
         else
         {
             m_xControl->copy_iterator(rLibRootEntry, *xLibSubRootEntry);
-            AddEntry(aEntryName, RID_BMP_MODLIB, xLibSubRootEntry.get(), true, o3tl::make_unique<Entry>(eType));
+            AddEntry(aEntryName, RID_BMP_MODLIB, xLibSubRootEntry.get(), true, std::make_unique<Entry>(eType));
         }
     }
 }
@@ -1159,7 +1158,7 @@ void SbTreeListBox::ImpCreateLibSubSubEntriesInVBAMode(weld::TreeIter& rLibSubRo
             {
                 m_xControl->copy_iterator(rLibSubRootEntry, *xModuleEntry);
                 AddEntry(aEntryName, RID_BMP_MODULE, xModuleEntry.get(), false,
-                         o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                         std::make_unique<Entry>(OBJ_TYPE_MODULE));
             }
 
             // methods
@@ -1176,7 +1175,7 @@ void SbTreeListBox::ImpCreateLibSubSubEntriesInVBAMode(weld::TreeIter& rLibSubRo
                     bool bEntry = FindEntry(aName, OBJ_TYPE_METHOD, *xEntry);
                     if (!bEntry)
                     {
-                        AddEntry(aName, RID_BMP_MACRO, xModuleEntry.get(), false, o3tl::make_unique<Entry>(OBJ_TYPE_METHOD));
+                        AddEntry(aName, RID_BMP_MACRO, xModuleEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_METHOD));
                     }
                 }
             }
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 7d7a6012355a..4fa61b7456ae 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
-#include <o3tl/make_unique.hxx>
 
 namespace basctl
 {
@@ -118,7 +117,7 @@ Dll::Dll () :
 {
     SfxObjectFactory& rFactory = DocShell::Factory();
 
-    auto pModule = o3tl::make_unique<Module>("basctl", &rFactory);
+    auto pModule = std::make_unique<Module>("basctl", &rFactory);
     SfxModule* pMod = pModule.get();
     SfxApplication::SetModule(SfxToolsModule::Basic, std::move(pModule));
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 9e351bac3ff4..be3c042a7f66 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -24,7 +24,6 @@
 #include <bitmaps.hlst>
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
-#include <o3tl/make_unique.hxx>
 #include <svx/passwd.hxx>
 #include <ucbhelper/content.hxx>
 #include <rtl/uri.hxx>
@@ -250,7 +249,7 @@ void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
         for ( sal_uInt16 nCol = 1; nCol < nCount; ++nCol )
         {
             SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nCol ));
-            pEntry->ReplaceItem(o3tl::make_unique<LibLBoxString>( rCol.GetText() ), nCol);
+            pEntry->ReplaceItem(std::make_unique<LibLBoxString>( rCol.GetText() ), nCol);
         }
     }
 }
@@ -1531,7 +1530,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                         aLibName,
                         Image(StockImage::Yes, sId),
                         pRootEntry, false,
-                        o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
+                        std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
                     DBG_ASSERT( pNewLibEntry, "Insert entry failed!" );
 
                     if( pNewLibEntry )
@@ -1540,7 +1539,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                             aModName,
                             Image(StockImage::Yes, RID_BMP_MODULE),
                             pNewLibEntry, false,
-                            o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                            std::make_unique<Entry>(OBJ_TYPE_MODULE));
                         DBG_ASSERT( pEntry_, "Insert entry failed!" );
                         pBasicBox->SetCurEntry( pEntry_ );
                         pBasicBox->Select( pBasicBox->GetCurEntry() );      // OV-Bug?!
@@ -1640,8 +1639,8 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                     BrowseMode nMode = pBasicBox->GetMode();
                     bool bDlgMode = ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules );
                     const OUString sId = bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB);
-                    pBasicBox->AddEntry(aLibName, sId, xRootEntry.get(), false, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
-                    pBasicBox->AddEntry(aModName, RID_BMP_MODULE, xRootEntry.get(), false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                    pBasicBox->AddEntry(aLibName, sId, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
+                    pBasicBox->AddEntry(aModName, RID_BMP_MODULE, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_MODULE));
                     pBasicBox->set_cursor(*xRootEntry);
                     pBasicBox->select(*xRootEntry);
                 }
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 6c67b1116282..ff02dbf7522d 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -29,7 +29,6 @@
 #include <basic/basmgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <comphelper/processfactory.hxx>
-#include <o3tl/make_unique.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
@@ -862,7 +861,7 @@ void ObjectPage::NewDialog()
                                 aDlgName,
                                 Image(StockImage::Yes, RID_BMP_DIALOG),
                                 pLibEntry, false,
-                                o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG));
+                                std::make_unique<Entry>(OBJ_TYPE_DIALOG));
                             DBG_ASSERT( pEntry, "Insert entry failed!" );
                         }
                         m_pBasicBox->SetCurEntry( pEntry );
@@ -1031,7 +1030,7 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                             aModName,
                             Image(StockImage::Yes, RID_BMP_MODULE),
                             pSubRootEntry, false,
-                            o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                            std::make_unique<Entry>(OBJ_TYPE_MODULE));
                         DBG_ASSERT( pEntry, "Insert entry failed!" );
                     }
                     rBasicBox.SetCurEntry( pEntry );
@@ -1127,7 +1126,7 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                     if (!bEntry)
                     {
                         rBasicBox.AddEntry(aModName, RID_BMP_MODULE, xEntry.get(), false,
-                                           o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
+                                           std::make_unique<Entry>(OBJ_TYPE_MODULE));
                     }
                     rBasicBox.set_cursor(*xEntry);
                     rBasicBox.select(*xEntry);