diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/dataproviderdlg.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index c68232e2081f..1e4c6af2728c 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -51,7 +51,7 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea( const EditTextObject* pEditObj, SvxAdjust eAdjust) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT), - mpEditObj(pEditObj->Clone().release()), + mpEditObj(pEditObj->Clone()), mpViewShell(pViewShell), meAdjust(eAdjust) { diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 935ec57cd5e1..7eda996e841d 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -455,16 +455,16 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl, Button*, void) { // insert new area - ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(), + std::unique_ptr<ScDBData> pNewEntry(new ScDBData( aNewName, aStart.Tab(), aStart.Col(), aStart.Row(), aEnd.Col(), aEnd.Row(), true, m_pBtnHeader->IsChecked(), - m_pBtnTotals->IsChecked() ); + m_pBtnTotals->IsChecked() )); pNewEntry->SetDoSize( m_pBtnDoSize->IsChecked() ); pNewEntry->SetKeepFmt( m_pBtnKeepFmt->IsChecked() ); pNewEntry->SetStripData( m_pBtnStripData->IsChecked() ); - bool ins = aLocalDbCol.getNamedDBs().insert(pNewEntry); + bool ins = aLocalDbCol.getNamedDBs().insert(std::move(pNewEntry)); assert(ins); (void)ins; } diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index f1441235e229..d82ce8b2ca39 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -93,7 +93,7 @@ bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange ) } else { - bOk = pDocColl->getNamedDBs().insert(pNew.release()); + bOk = pDocColl->getNamedDBs().insert(std::move(pNew)); } if ( bCompile ) rDoc.CompileHybridFormula(); @@ -164,13 +164,13 @@ bool ScDBDocFunc::RenameDBRange( const OUString& rOld, const OUString& rNew ) { ScDocShellModificator aModificator( rDocShell ); - ScDBData* pNewData = new ScDBData(rNew, **iterOld); + std::unique_ptr<ScDBData> pNewData(new ScDBData(rNew, **iterOld)); std::unique_ptr<ScDBCollection> pUndoColl( new ScDBCollection( *pDocColl ) ); rDoc.PreprocessDBDataUpdate(); rDBs.erase(iterOld); - bool bInserted = rDBs.insert(pNewData); + bool bInserted = rDBs.insert(std::move(pNewData)); if (!bInserted) // error -> restore old state { rDoc.SetDBCollection(std::move(pUndoColl)); // belongs to the document then diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 79710f264618..f94be4468f18 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -309,7 +309,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe pNoNameData = new ScDBData( aNewName, nTab, nStartCol,nStartRow, nEndCol,nEndRow, true, bHasHeader ); - bool ins = rDBs.insert(pNoNameData); + bool ins = rDBs.insert(std::unique_ptr<ScDBData>(pNoNameData)); assert(ins); (void)ins; } else diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index 145d276a1bf5..8686a16a468d 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -966,7 +966,7 @@ ScDataProviderDlg::ScDataProviderDlg(vcl::Window* pParent, std::shared_ptr<ScDoc mpList->addEntry(mpDataProviderCtrl); mpIndex++; pDBData = new ScDBData("data", 0, 0, 0, MAXCOL, MAXROW); - bool bSuccess = mpDoc->GetDBCollection()->getNamedDBs().insert(pDBData); + bool bSuccess = mpDoc->GetDBCollection()->getNamedDBs().insert(std::unique_ptr<ScDBData>(pDBData)); SAL_WARN_IF(!bSuccess, "sc", "temporary warning"); InitMenu(); |