diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /sc/source/ui/docshell/docfunc.cxx | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'sc/source/ui/docshell/docfunc.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 10 |
1 files changed, 10 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) |