summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-02 16:41:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-10-02 16:49:49 +0200
commit075d472a9d120431f0b8731e4dcfe3e8b4ded521 (patch)
tree90f565b0f3c4afdf3294d857969ef724e091a139 /sc
parent3e1bd6961d3317fe2bef4a34a41f5d1fc2a33008 (diff)
Use std::auto_ptr::reset where applicable
(avoids warnings about std::auto_ptr ctor being deprecated) Change-Id: I39d2d155c0bc62ca77a30c02428ea39102213f42
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/documen2.cxx2
-rw-r--r--sc/source/core/tool/chartlock.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index cd09ffbd82b2..1086bd166d9b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -237,7 +237,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
pDBCollection = new ScDBCollection(this);
pSelectionAttr = NULL;
pChartCollection = new ScChartCollection;
- apTemporaryChartLock = std::auto_ptr< ScTemporaryChartLock >( new ScTemporaryChartLock(this) );
+ apTemporaryChartLock.reset( new ScTemporaryChartLock(this) );
xColNameRanges = new ScRangePairList;
xRowNameRanges = new ScRangePairList;
ImplCreateOptions();
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index dfc2b5c20f97..b63d3b93bd7c 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -158,7 +158,7 @@ ScTemporaryChartLock::~ScTemporaryChartLock()
void ScTemporaryChartLock::StartOrContinueLocking()
{
if(!mapScChartLockGuard.get())
- mapScChartLockGuard = std::auto_ptr< ScChartLockGuard >( new ScChartLockGuard(mpDoc) );
+ mapScChartLockGuard.reset( new ScChartLockGuard(mpDoc) );
maTimer.Start();
}