[Libreoffice-commits] core.git: basctl/source basic/source bridges/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 16 06:21:13 UTC 2019
basctl/source/basicide/basdoc.cxx | 3
basctl/source/basicide/bastype2.cxx | 29 ++++-----
basctl/source/basicide/iderdll.cxx | 3
basctl/source/basicide/moduldl2.cxx | 11 +--
basctl/source/basicide/moduldlg.cxx | 7 --
basic/source/basmgr/basmgr.cxx | 1
basic/source/classes/sbunoobj.cxx | 3
basic/source/comp/exprtree.cxx | 69 ++++++++++------------
basic/source/comp/parser.cxx | 5 -
basic/source/comp/sbcomp.cxx | 3
basic/source/comp/symtbl.cxx | 5 -
basic/source/runtime/methods.cxx | 5 -
basic/source/sbx/sbxbase.cxx | 3
basic/source/sbx/sbxscan.cxx | 4 -
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 3
15 files changed, 69 insertions(+), 85 deletions(-)
New commits:
commit e48e063254caa7eb26b5c3c50fd64236d59ed553
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Jan 13 15:13:32 2019 +0100
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 16 07:20:49 2019 +0100
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 at collabora.co.uk>
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);
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 0cd4123cf5b6..92d94a423334 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -32,7 +32,6 @@
#include <tools/diagnose_ex.h>
#include <basic/sbmod.hxx>
#include <unotools/intlwrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <basic/sbuno.hxx>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index f3c276d88003..2daadfad2c04 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/errcode.hxx>
@@ -4646,7 +4645,7 @@ void SbUnoStructRefObject::initMemberCache()
for ( sal_Int32 nPos = pCompTypeDescr->nMembers; nPos--; )
{
OUString aName( ppNames[nPos] );
- maFields[ aName ] = o3tl::make_unique<StructRefInfo>( maMemberInfo.getRootAnyRef(), ppTypeRefs[nPos], maMemberInfo.getPos() + pMemberOffsets[nPos] );
+ maFields[ aName ] = std::make_unique<StructRefInfo>( maMemberInfo.getRootAnyRef(), ppTypeRefs[nPos], maMemberInfo.getPos() + pMemberOffsets[nPos] );
}
}
typelib_typedescription_release(pTD);
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index ed7f49e1b4e0..68345a5e5636 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -22,7 +22,6 @@
#include <parser.hxx>
#include <basic/sbx.hxx>
#include <expr.hxx>
-#include <o3tl/make_unique.hxx>
SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo )
@@ -54,7 +53,7 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t )
nParenLevel = 0;
eCurExpr = SbOPERAND;
m_eMode = EXPRMODE_STANDARD;
- pExpr = o3tl::make_unique<SbiExprNode>( n, t );
+ pExpr = std::make_unique<SbiExprNode>( n, t );
pExpr->Optimize(pParser);
}
@@ -65,7 +64,7 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprListPtr p
nParenLevel = 0;
eCurExpr = SbOPERAND;
m_eMode = EXPRMODE_STANDARD;
- pExpr = o3tl::make_unique<SbiExprNode>( r, SbxVARIANT, std::move(pPar) );
+ pExpr = std::make_unique<SbiExprNode>( r, SbxVARIANT, std::move(pPar) );
}
SbiExpression::~SbiExpression() { }
@@ -179,7 +178,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw
if( !pNd )
{
pParser->Error( ERRCODE_BASIC_UNEXPECTED, DOT );
- pNd = o3tl::make_unique<SbiExprNode>( 1.0, SbxDOUBLE );
+ pNd = std::make_unique<SbiExprNode>( 1.0, SbxDOUBLE );
}
return pNd;
}
@@ -199,7 +198,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw
if( eNextTok == ASSIGN )
{
pParser->UnlockColumn();
- return o3tl::make_unique<SbiExprNode>( aSym );
+ return std::make_unique<SbiExprNode>( aSym );
}
// no keywords allowed from here on!
if( SbiTokenizer::IsKwd( eTok )
@@ -291,11 +290,11 @@ std::unique_ptr<SbiExprNode> SbiExpression::Term( const KeywordSymbolInfo* pKeyw
pvMoreParLcl.reset();
if( pConst->GetType() == SbxSTRING )
{
- return o3tl::make_unique<SbiExprNode>( pConst->GetString() );
+ return std::make_unique<SbiExprNode>( pConst->GetString() );
}
else
{
- return o3tl::make_unique<SbiExprNode>( pConst->GetValue(), pConst->GetType() );
+ return std::make_unique<SbiExprNode>( pConst->GetValue(), pConst->GetType() );
}
}
@@ -496,24 +495,24 @@ std::unique_ptr<SbiExprNode> SbiExpression::Operand( bool bUsedForTypeOf )
if( !bUsedForTypeOf && pParser->IsVBASupportOn() && pParser->Peek() == IS )
{
eTok = pParser->Next();
- pRes = o3tl::make_unique<SbiExprNode>( std::move(pRes), eTok, Like() );
+ pRes = std::make_unique<SbiExprNode>( std::move(pRes), eTok, Like() );
}
break;
case DOT: // .with
pRes = Term(); break;
case NUMBER:
pParser->Next();
- pRes = o3tl::make_unique<SbiExprNode>( pParser->GetDbl(), pParser->GetType() );
+ pRes = std::make_unique<SbiExprNode>( pParser->GetDbl(), pParser->GetType() );
break;
case FIXSTRING:
pParser->Next();
- pRes = o3tl::make_unique<SbiExprNode>( pParser->GetSym() ); break;
+ pRes = std::make_unique<SbiExprNode>( pParser->GetSym() ); break;
case LPAREN:
pParser->Next();
if( nParenLevel == 0 && m_eMode == EXPRMODE_LPAREN_PENDING && pParser->Peek() == RPAREN )
{
m_eMode = EXPRMODE_EMPTY_PAREN;
- pRes = o3tl::make_unique<SbiExprNode>(); // Dummy node
+ pRes = std::make_unique<SbiExprNode>(); // Dummy node
pParser->Next();
break;
}
@@ -558,7 +557,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Operand( bool bUsedForTypeOf )
else
{
pParser->Next();
- pRes = o3tl::make_unique<SbiExprNode>( 1.0, SbxDOUBLE );
+ pRes = std::make_unique<SbiExprNode>( 1.0, SbxDOUBLE );
pParser->Error( ERRCODE_BASIC_UNEXPECTED, eTok );
}
break;
@@ -575,7 +574,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Unary()
case MINUS:
eTok = NEG;
pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( Unary(), eTok, nullptr );
+ pNd = std::make_unique<SbiExprNode>( Unary(), eTok, nullptr );
break;
case NOT:
if( pParser->IsVBASupportOn() )
@@ -585,7 +584,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Unary()
else
{
pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( Unary(), eTok, nullptr );
+ pNd = std::make_unique<SbiExprNode>( Unary(), eTok, nullptr );
}
break;
case PLUS:
@@ -599,7 +598,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Unary()
pParser->TestToken( IS );
SbiSymDef* pTypeDef = new SbiSymDef( OUString() );
pParser->TypeDecl( *pTypeDef, true );
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pObjNode), pTypeDef->GetTypeId() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pObjNode), pTypeDef->GetTypeId() );
break;
}
case NEW:
@@ -607,7 +606,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Unary()
pParser->Next();
SbiSymDef* pTypeDef = new SbiSymDef( OUString() );
pParser->TypeDecl( *pTypeDef, true );
- pNd = o3tl::make_unique<SbiExprNode>( pTypeDef->GetTypeId() );
+ pNd = std::make_unique<SbiExprNode>( pTypeDef->GetTypeId() );
break;
}
default:
@@ -624,7 +623,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Exp()
while( pParser->Peek() == EXPON )
{
SbiToken eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Unary() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Unary() );
}
}
return pNd;
@@ -643,7 +642,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::MulDiv()
break;
}
eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Exp() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Exp() );
}
}
return pNd;
@@ -657,7 +656,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::IntDiv()
while( pParser->Peek() == IDIV )
{
SbiToken eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, MulDiv() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, MulDiv() );
}
}
return pNd;
@@ -671,7 +670,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Mod()
while( pParser->Peek() == MOD )
{
SbiToken eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, IntDiv() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, IntDiv() );
}
}
return pNd;
@@ -690,7 +689,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::AddSub()
break;
}
eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Mod() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Mod() );
}
}
return pNd;
@@ -709,7 +708,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Cat()
break;
}
eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, AddSub() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, AddSub() );
}
}
return pNd;
@@ -734,7 +733,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Comp()
break;
}
eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Cat() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Cat() );
nCount++;
}
}
@@ -750,7 +749,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::VBA_Not()
if( eTok == NOT )
{
pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( VBA_Not(), eTok, nullptr );
+ pNd = std::make_unique<SbiExprNode>( VBA_Not(), eTok, nullptr );
}
else
{
@@ -768,7 +767,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Like()
while( pParser->Peek() == LIKE )
{
SbiToken eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Comp() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Comp() );
nCount++;
}
// multiple operands in a row does not work
@@ -796,7 +795,7 @@ std::unique_ptr<SbiExprNode> SbiExpression::Boolean()
break;
}
eTok = pParser->Next();
- pNd = o3tl::make_unique<SbiExprNode>( std::move(pNd), eTok, Like() );
+ pNd = std::make_unique<SbiExprNode>( std::move(pNd), eTok, Like() );
}
}
return pNd;
@@ -840,7 +839,7 @@ SbiConstExpression::SbiConstExpression( SbiParser* p ) : SbiExpression( p )
if( bIsBool )
{
- pExpr = o3tl::make_unique<SbiExprNode>( (bBoolVal ? SbxTRUE : SbxFALSE), SbxINTEGER );
+ pExpr = std::make_unique<SbiExprNode>( (bBoolVal ? SbxTRUE : SbxFALSE), SbxINTEGER );
eType = pExpr->GetType();
nVal = pExpr->nVal;
}
@@ -919,7 +918,7 @@ void SbiExprList::addExpression( std::unique_ptr<SbiExpression>&& pExpr )
//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandaloneExpression, bool bPar)
{
- auto pExprList = o3tl::make_unique<SbiExprList>();
+ auto pExprList = std::make_unique<SbiExprList>();
if( !bPar )
{
return pExprList;
@@ -959,7 +958,7 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandalon
// missing argument
if( eTok == COMMA )
{
- pExpr = o3tl::make_unique<SbiExpression>( pParser, 0, SbxEMPTY );
+ pExpr = std::make_unique<SbiExpression>( pParser, 0, SbxEMPTY );
}
// named arguments: either .name= or name:=
else
@@ -974,7 +973,7 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandalon
if( bAssumeExprLParenMode )
{
- pExpr = o3tl::make_unique<SbiExpression>( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
+ pExpr = std::make_unique<SbiExpression>( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
bAssumeExprLParenMode = false;
SbiExprMode eModeAfter = pExpr->m_eMode;
@@ -999,7 +998,7 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandalon
}
else
{
- pExpr = o3tl::make_unique<SbiExpression>( pParser );
+ pExpr = std::make_unique<SbiExpression>( pParser );
}
if( bByVal && pExpr->IsLvalue() )
{
@@ -1014,7 +1013,7 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandalon
// SbiExpression::Term() has made as string out of it
aName = pExpr->GetString();
pParser->Next();
- pExpr = o3tl::make_unique<SbiExpression>( pParser );
+ pExpr = std::make_unique<SbiExpression>( pParser );
}
pExpr->GetName() = aName;
}
@@ -1065,7 +1064,7 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* pParser, bool bStandalon
SbiExprListPtr SbiExprList::ParseDimList( SbiParser* pParser )
{
- auto pExprList = o3tl::make_unique<SbiExprList>();
+ auto pExprList = std::make_unique<SbiExprList>();
if( pParser->Next() != LPAREN )
{
@@ -1078,11 +1077,11 @@ SbiExprListPtr SbiExprList::ParseDimList( SbiParser* pParser )
SbiToken eTok;
for( ;; )
{
- auto pExpr1 = o3tl::make_unique<SbiExpression>( pParser );
+ auto pExpr1 = std::make_unique<SbiExpression>( pParser );
eTok = pParser->Next();
if( eTok == TO )
{
- auto pExpr2 = o3tl::make_unique<SbiExpression>( pParser );
+ auto pExpr2 = std::make_unique<SbiExpression>( pParser );
pExpr1->ConvertToIntConstIfPossible();
pExpr2->ConvertToIntConstIfPossible();
eTok = pParser->Next();
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index fcf524a8057a..44eb2efcbc2f 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/script/ModuleType.hpp>
#include <svtools/miscopt.hxx>
#include <rtl/character.hxx>
-#include <o3tl/make_unique.hxx>
struct SbiParseStack { // "Stack" for statement-blocks
SbiParseStack* pNext; // Chain
@@ -508,10 +507,10 @@ void SbiParser::Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo )
if( nParCount == 2 || nParCount == 3 )
{
if( nParCount == 2 )
- pPar->addExpression( o3tl::make_unique<SbiExpression>( this, -1, SbxLONG ) );
+ pPar->addExpression( std::make_unique<SbiExpression>( this, -1, SbxLONG ) );
TestToken( EQ );
- pPar->addExpression( o3tl::make_unique<SbiExpression>( this ) );
+ pPar->addExpression( std::make_unique<SbiExpression>( this ) );
bSpecialMidHandling = true;
}
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index bd789433be6f..a13b85fdd2ab 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -25,7 +25,6 @@
#include <svtools/miscopt.hxx>
#include <rtl/character.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
// This routine is defined here, so that the
// compiler can be loaded as a discrete segment.
@@ -42,7 +41,7 @@ bool SbModule::Compile()
SbModule* pOld = GetSbData()->pCompMod;
GetSbData()->pCompMod = this;
- auto pParser = o3tl::make_unique<SbiParser>( pBasic, this );
+ auto pParser = std::make_unique<SbiParser>( pBasic, this );
while( pParser->Parse() ) {}
if( !pParser->GetErrors() )
pParser->aGen.Save();
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 351cdaa818e5..aa7ce59e949f 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
#include <rtl/character.hxx>
-#include <o3tl/make_unique.hxx>
// All symbol names are laid down int the symbol-pool's stringpool, so that
// all symbols are handled in the same case. On saving the code-image, the
@@ -352,7 +351,7 @@ SbiSymPool& SbiSymDef::GetPool()
{
if( !pPool )
{
- pPool = o3tl::make_unique<SbiSymPool>( pIn->pParser->aGblStrings, SbLOCAL, pIn->pParser );// is dumped
+ pPool = std::make_unique<SbiSymPool>( pIn->pParser->aGblStrings, SbLOCAL, pIn->pParser );// is dumped
}
return *pPool;
}
@@ -378,7 +377,7 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const OUString& rName,
, mbProcDecl( bProcDecl )
{
aParams.SetParent( &pParser->aPublics );
- pPool = o3tl::make_unique<SbiSymPool>( pParser->aGblStrings, SbLOCAL, pParser );
+ pPool = std::make_unique<SbiSymPool>( pParser->aGblStrings, SbLOCAL, pParser );
pPool->SetParent( &aParams );
nLine1 =
nLine2 = 0;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0ecced15e6b3..3a6bbc2715a5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -65,7 +65,6 @@
#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
#include <memory>
#include <random>
-#include <o3tl/make_unique.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
using namespace comphelper;
@@ -2567,7 +2566,7 @@ static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLDa
// invalid anyway because it was not accepted by OSL before
if (aPureFileName != "*")
{
- rRTLData.pWildCard = o3tl::make_unique<WildCard>(aPureFileName);
+ rRTLData.pWildCard = std::make_unique<WildCard>(aPureFileName);
}
return aPathStr;
}
@@ -2798,7 +2797,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool)
// Read directory
bool bIncludeFolders = bool(nFlags & SbAttributes::DIRECTORY);
- rRTLData.pDir = o3tl::make_unique<Directory>(aDirURL);
+ rRTLData.pDir = std::make_unique<Directory>(aDirURL);
FileBase::RC nRet = rRTLData.pDir->open();
if( nRet != FileBase::E_None )
{
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 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 038f88f1d18e..350e5df4e6a2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -28,7 +28,6 @@
#include <dlfcn.h>
-#include <o3tl/make_unique.hxx>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -210,7 +209,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr)
default:
{
m_rttiNames.emplace_back(OString(rttiName));
- auto pad = o3tl::make_unique<char[]>(
+ auto pad = std::make_unique<char[]>(
sizeof (__cxxabiv1::__vmi_class_type_info)
+ ((itd.nBaseTypes - 1)
* sizeof (
More information about the Libreoffice-commits
mailing list