diff options
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 6dad099859a0..a1d52140b79d 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3409,7 +3409,9 @@ void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoTabProtect(&rDocShell, nTab, p) ); @@ -3439,7 +3441,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScDocProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> p(new ScDocProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDocProtect(&rDocShell, p) ); @@ -3461,7 +3465,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!"); if (pProtect) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP p->setProtected(true); // just in case ... rDocShell.GetUndoManager()->AddUndoAction( new ScUndoTabProtect(&rDocShell, nTab, p) ); @@ -3491,7 +3497,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp return true; // save the protection state before unprotect (for undo). + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDocProtection> pProtectCopy(new ScDocProtection(*pDocProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pDocProtect->verifyPassword(rPassword)) { @@ -3522,7 +3530,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp return true; // save the protection state before unprotect (for undo). + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScTableProtection> pProtectCopy(new ScTableProtection(*pTabProtect)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pTabProtect->verifyPassword(rPassword)) { if (!bApi) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index c2d2958590db..a2d5ba50bcd4 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -920,8 +920,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s if (bRecord) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab)); auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab)); + SAL_WNODEPRECATED_DECLARATIONS_POP GetUndoManager()->AddUndoAction( new ScUndoCopyTab(this, pSrcList.release(), pDestList.release())); } @@ -984,8 +986,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s } else if (bRecord) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab)); auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab)); + SAL_WNODEPRECATED_DECLARATIONS_POP GetUndoManager()->AddUndoAction( new ScUndoMoveTab(this, pSrcList.release(), pDestList.release())); } diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 62fe0dd6c288..c80653193daf 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1388,7 +1388,9 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange& ::boost::scoped_ptr<ScRange> pUsedRange; + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTokenArray> pArray(new ScTokenArray); + SAL_WNODEPRECATED_DECLARATIONS_POP bool bFirstTab = true; vector<ScExternalRefCache::SingleRangeData>::iterator itrCache = rCacheData.begin(), itrCacheEnd = rCacheData.end(); @@ -1503,7 +1505,9 @@ static ScTokenArray* lcl_fillEmptyMatrix(const ScRange& rRange) xMat->PutEmpty(i, j); ScMatrixToken aToken(xMat); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScTokenArray> pArray(new ScTokenArray); + SAL_WNODEPRECATED_DECLARATIONS_POP pArray->AddToken(aToken); return pArray.release(); } @@ -2228,7 +2232,9 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt // make medium hidden to prevent assertion from progress bar pSet->Put( SfxBoolItem(SID_HIDDEN, true) ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, false, pFilter, pSet)); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pMedium->GetError() != ERRCODE_NONE) return NULL; |