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/core/tool/dbdata.cxx | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'sc/source/core/tool/dbdata.cxx')
| -rw-r--r-- | sc/source/core/tool/dbdata.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index f4881f61da25..609fc52f7bb0 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -726,7 +726,9 @@ ScDBData* ScDBCollection::NamedDBs::findByUpperName(const ::rtl::OUString& rName bool ScDBCollection::NamedDBs::insert(ScDBData* p) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr<ScDBData> pData(p); + SAL_WNODEPRECATED_DECLARATIONS_POP if (!pData->GetIndex()) pData->SetIndex(mrParent.nEntryIndex++); @@ -806,9 +808,11 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange) { // Insert a new db data. They all have identical names. rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pNew(new ScDBData( aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row(), true, false)); + SAL_WNODEPRECATED_DECLARATIONS_POP pData = pNew.get(); maDBs.push_back(pNew); } @@ -818,7 +822,9 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange) void ScDBCollection::AnonDBs::insert(ScDBData* p) { rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pNew(p); + SAL_WNODEPRECATED_DECLARATIONS_POP maDBs.push_back(pNew); } |