diff options
Diffstat (limited to 'sc/source/ui/docshell/dbdocfun.cxx')
| -rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index a3c1474766bf..05fe11477c6f 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <o3tl/make_unique.hxx> #include <sfx2/app.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> @@ -107,8 +106,8 @@ bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange ) if (bUndo) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), - o3tl::make_unique<ScDBCollection>( *pDocColl ) ) ); + std::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), + std::make_unique<ScDBCollection>( *pDocColl ) ) ); } aModificator.SetDocumentModified(); @@ -140,8 +139,8 @@ bool ScDBDocFunc::DeleteDBRange(const OUString& rName) if (bUndo) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), - o3tl::make_unique<ScDBCollection>( *pDocColl ) ) ); + std::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), + std::make_unique<ScDBCollection>( *pDocColl ) ) ); } aModificator.SetDocumentModified(); @@ -184,8 +183,8 @@ bool ScDBDocFunc::RenameDBRange( const OUString& rOld, const OUString& rNew ) if (bUndo) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), - o3tl::make_unique<ScDBCollection>( *pDocColl ) ) ); + std::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), + std::make_unique<ScDBCollection>( *pDocColl ) ) ); } else pUndoColl.reset(); @@ -235,8 +234,8 @@ void ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) if (bUndo) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), - o3tl::make_unique<ScDBCollection>( *pDocColl ) ) ); + std::make_unique<ScUndoDBData>( &rDocShell, std::move(pUndoColl), + std::make_unique<ScDBCollection>( *pDocColl ) ) ); } aModificator.SetDocumentModified(); @@ -276,8 +275,8 @@ void ScDBDocFunc::ModifyAllDBData( const ScDBCollection& rNewColl, const std::ve if (bRecord) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDBData>(&rDocShell, std::move(pUndoColl), - o3tl::make_unique<ScDBCollection>(rNewColl))); + std::make_unique<ScUndoDBData>(&rDocShell, std::move(pUndoColl), + std::make_unique<ScDBCollection>(rNewColl))); } } @@ -443,7 +442,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bApi, bool bIsUnnamed, } rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoRepeatDB>( &rDocShell, nTab, + std::make_unique<ScUndoRepeatDB>( &rDocShell, nTab, nStartCol, nStartRow, nEndCol, nEndRow, nNewEndRow, //nCurX, nCurY, @@ -583,7 +582,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, { // Set up an undo object. rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<sc::UndoSort>(&rDocShell, aUndoParam)); + std::make_unique<sc::UndoSort>(&rDocShell, aUndoParam)); } pDBData->SetSortParam(rSortParam); @@ -939,7 +938,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, { // create undo action after executing, because of drawing layer undo rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoQuery>( &rDocShell, nTab, rQueryParam, std::move(pUndoDoc), std::move(pUndoDB), + std::make_unique<ScUndoQuery>( &rDocShell, nTab, rQueryParam, std::move(pUndoDoc), std::move(pUndoDB), pOld, bDoSize, pAdvSource ) ); } @@ -1117,7 +1116,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, { // ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoSubTotals>( &rDocShell, nTab, + std::make_unique<ScUndoSubTotals>( &rDocShell, nTab, rParam, aNewParam.nRow2, std::move(pUndoDoc), std::move(pUndoTab), // pUndoDBData, std::move(pUndoRange), std::move(pUndoDB) ) ); @@ -1331,7 +1330,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb if (bRecord) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDataPilot>( + std::make_unique<ScUndoDataPilot>( &rDocShell, std::move(pOldUndoDoc), std::move(pNewUndoDoc), &aUndoDPObj, pOldObj, bAllowMove)); } @@ -1376,7 +1375,7 @@ bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) for (SdrOle2Obj* pChartObject : aListOfObjects) { rDoc.GetChartListenerCollection()->removeByName(pChartObject->GetName()); - pModel->AddUndo(o3tl::make_unique<SdrUndoDelObj>(*pChartObject)); + pModel->AddUndo(std::make_unique<SdrUndoDelObj>(*pChartObject)); pChartObject->getSdrPageFromSdrObject()->RemoveObject(pChartObject->GetOrdNum()); } } @@ -1415,7 +1414,7 @@ bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) if (bRecord) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDataPilot>( + std::make_unique<ScUndoDataPilot>( &rDocShell, std::move(pOldUndoDoc), nullptr, pUndoDPObj.get(), nullptr, false)); // pUndoDPObj is copied @@ -1527,7 +1526,7 @@ bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool if (bRecord) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDataPilot>(&rDocShell, nullptr, std::move(pNewUndoDoc), nullptr, &rDestObj, false)); + std::make_unique<ScUndoDataPilot>(&rDocShell, nullptr, std::move(pNewUndoDoc), nullptr, &rDestObj, false)); } // notify API objects @@ -1602,7 +1601,7 @@ bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) if (bRecord) { rDocShell.GetUndoManager()->AddUndoAction( - o3tl::make_unique<ScUndoDataPilot>( + std::make_unique<ScUndoDataPilot>( &rDocShell, std::move(pOldUndoDoc), std::move(pNewUndoDoc), &aUndoDPObj, &rDPObj, false)); } |