diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-13 15:13:32 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-16 07:20:49 +0100 |
| commit | e48e063254caa7eb26b5c3c50fd64236d59ed553 (patch) | |
| tree | df7519af69e3d8c016cf1d0823bc1365afacc6ce /basctl/source/basicide/moduldl2.cxx | |
| parent | b0f3f3094cb3944945dcd59e7fd44f7fe0b433b7 (diff) | |
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>
Diffstat (limited to 'basctl/source/basicide/moduldl2.cxx')
| -rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
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); } |