diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 17:26:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 17:51:30 +0200 |
| commit | 89c72084b23b14780d0799f2f2f32c579212f497 (patch) | |
| tree | 5d7aceedbe6be23b302c382e14d5148d460b0b89 /sc/inc/document.hxx | |
| parent | Some glue for using std::unique_ptr with the Boost Pointer Container Library (diff) | |
| download | core-89c72084b23b14780d0799f2f2f32c579212f497.tar.gz core-89c72084b23b14780d0799f2f2f32c579212f497.zip | |
sc: std::auto_ptr -> std::unique_ptr
Change-Id: I25468d578de597ff9aeba3ffc850c630fa532767
Diffstat (limited to 'sc/inc/document.hxx')
| -rw-r--r-- | sc/inc/document.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 9c462d7536dc..1d14b9f0382b 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -290,7 +290,7 @@ private: ScDBCollection* pDBCollection; ScDPCollection* pDPCollection; ScChartCollection* pChartCollection; - std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; + std::unique_ptr< ScTemporaryChartLock > apTemporaryChartLock; ScPatternAttr* pSelectionAttr; // Attributes of a block ScFormulaCell* pFormulaTree; // formula tree (start) ScFormulaCell* pEOFormulaTree; // formula tree (end), last cell @@ -311,14 +311,14 @@ private: ScFieldEditEngine* pCacheFieldEditEngine; - ::std::auto_ptr<ScDocProtection> pDocProtection; - ::std::auto_ptr<ScClipParam> mpClipParam; + ::std::unique_ptr<ScDocProtection> pDocProtection; + ::std::unique_ptr<ScClipParam> mpClipParam; - ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr; - ::std::auto_ptr<ScMacroManager> mpMacroMgr; + ::std::unique_ptr<ScExternalRefManager> pExternalRefMgr; + ::std::unique_ptr<ScMacroManager> mpMacroMgr; // mutable for lazy construction - mutable ::std::auto_ptr< ScFormulaParserPool > + mutable ::std::unique_ptr< ScFormulaParserPool > mxFormulaParserPool; /// Pool for all external formula parsers used by this document. OUString aDocName; // optional: name of document @@ -338,7 +338,7 @@ private: ScLookupCacheMapImpl* pLookupCacheMapImpl; // cache for lookups like VLOOKUP and MATCH - SfxItemSet* pPreviewFont; // convert to std::auto_ptr or whatever + SfxItemSet* pPreviewFont; // convert to std::unique_ptr or whatever ScStyleSheet* pPreviewCellStyle; ScMarkData maPreviewSelection; sal_Int64 nUnoObjectId; // counted up for UNO objects |