summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r--sc/source/filter/inc/connectionsbuffer.hxx2
-rw-r--r--sc/source/filter/inc/defnamesbuffer.hxx4
-rw-r--r--sc/source/filter/inc/drawingfragment.hxx2
-rw-r--r--sc/source/filter/inc/formulaparser.hxx2
-rw-r--r--sc/source/filter/inc/fprogressbar.hxx6
-rw-r--r--sc/source/filter/inc/htmlpars.hxx8
-rw-r--r--sc/source/filter/inc/pagesettings.hxx2
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx2
-rw-r--r--sc/source/filter/inc/themebuffer.hxx2
-rw-r--r--sc/source/filter/inc/worksheetfragment.hxx2
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx6
-rw-r--r--sc/source/filter/inc/xcl97rec.hxx2
-rw-r--r--sc/source/filter/inc/xehelper.hxx4
-rw-r--r--sc/source/filter/inc/xestyle.hxx2
-rw-r--r--sc/source/filter/inc/xicontent.hxx2
-rw-r--r--sc/source/filter/inc/xihelper.hxx4
-rw-r--r--sc/source/filter/inc/xilink.hxx6
-rw-r--r--sc/source/filter/inc/xistyle.hxx2
-rw-r--r--sc/source/filter/inc/xlpage.hxx2
19 files changed, 29 insertions, 33 deletions
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 00cd1d03c73c..03f36d927929 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -62,7 +62,7 @@ struct WebPrModel
/** Common properties of an external data connection. */
struct ConnectionModel
{
- typedef ::std::auto_ptr< WebPrModel > WebPrModelPtr;
+ typedef ::std::unique_ptr< WebPrModel > WebPrModelPtr;
WebPrModelPtr mxWebPr; /// Special settings for web queries.
OUString maName; /// Unique name of this connection.
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index 4adc1b7c164f..09f1579387fc 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -136,8 +136,8 @@ private:
void implImportBiffFormula();
private:
- typedef ::std::auto_ptr< StreamDataSequence > StreamDataSeqPtr;
- typedef ::std::auto_ptr< BiffInputStreamPos > BiffStreamPosPtr;
+ typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr;
+ typedef ::std::unique_ptr< BiffInputStreamPos > BiffStreamPosPtr;
ScRangeData* mpScRangeData; /// ScRangeData of the defined name.
sal_Int32 mnTokenIndex; /// Name index used in API token array.
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index 1afd26f20f35..4e36ad63a199 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -112,7 +112,7 @@ protected:
virtual void onEndElement() SAL_OVERRIDE;
private:
- typedef ::std::auto_ptr< ShapeAnchor > ShapeAnchorRef;
+ typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
mxDrawPage; /// Drawing page of this sheet.
diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx
index 47d0cf25dc79..9bc058d5ed5a 100644
--- a/sc/source/filter/inc/formulaparser.hxx
+++ b/sc/source/filter/inc/formulaparser.hxx
@@ -139,7 +139,7 @@ public:
OUString importMacroName( const OUString& rFormulaString );
private:
- ::std::auto_ptr< FormulaParserImpl > mxImpl;
+ ::std::unique_ptr< FormulaParserImpl > mxImpl;
};
} // namespace xls
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 1c9d3f74f8d3..5b2a8441285c 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -152,7 +152,7 @@ private:
/** Contains all data of a segment of the progress bar. */
struct ScfProgressSegment
{
- typedef ::std::auto_ptr< ScfProgressBar > ScfProgressBarPtr;
+ typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr;
ScfProgressBarPtr mxProgress; /// Pointer to sub progress bar for this segment.
sal_Size mnSize; /// Size of this segment.
@@ -162,7 +162,7 @@ private:
~ScfProgressSegment();
};
- typedef ::std::auto_ptr< ScProgress > ScProgressPtr;
+ typedef ::std::unique_ptr< ScProgress > ScProgressPtr;
typedef boost::ptr_vector< ScfProgressSegment > ScfSegmentList;
ScfSegmentList maSegments; /// List of progress segments.
@@ -216,7 +216,7 @@ private:
void Init( SfxObjectShell* pDocShell, const OUString& rText );
private:
- typedef ::std::auto_ptr< ScfSimpleProgressBar > ScfSimpleProgressBarPtr;
+ typedef ::std::unique_ptr< ScfSimpleProgressBar > ScfSimpleProgressBarPtr;
ScfSimpleProgressBarPtr mxProgress; /// The used progress bar.
SvStream& mrStrm; /// The used stream.
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index b24ab983d6f8..d39737a776bc 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -464,12 +464,12 @@ protected:
void RecalcDocPos( const ScHTMLPos& rBasePos );
private:
- typedef ::std::auto_ptr< ScHTMLTableMap > ScHTMLTableMapPtr;
- typedef ::std::auto_ptr< SfxItemSet > SfxItemSetPtr;
+ typedef ::std::unique_ptr< ScHTMLTableMap > ScHTMLTableMapPtr;
+ typedef ::std::unique_ptr< SfxItemSet > SfxItemSetPtr;
typedef ::std::vector< SCCOLROW > ScSizeVec;
typedef ::std::list< ScHTMLEntry* > ScHTMLEntryList;
typedef ::std::map< ScHTMLPos, ScHTMLEntryList > ScHTMLEntryMap;
- typedef ::std::auto_ptr< ScHTMLEntry > ScHTMLEntryPtr;
+ typedef ::std::unique_ptr< ScHTMLEntry > ScHTMLEntryPtr;
/** Returns true, if the current cell does not contain an entry yet. */
bool IsEmptyCell() const;
@@ -632,7 +632,7 @@ private:
DECL_LINK( HTMLImportHdl, const ImportInfo* );
private:
- typedef ::std::auto_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr;
+ typedef ::std::unique_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr;
OUStringBuffer maTitle; /// The title of the document.
ScHTMLGlobalTablePtr mxGlobTable; /// Contains the entire imported document.
diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx
index dc5b93a7ba56..f9a9ff2e9391 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -168,7 +168,7 @@ private:
const OUString& rContent );
private:
- typedef ::std::auto_ptr< HeaderFooterParser > HeaderFooterParserPtr;
+ typedef ::std::unique_ptr< HeaderFooterParser > HeaderFooterParserPtr;
HeaderFooterParserPtr mxHFParser;
HFHelperData maHeaderData;
HFHelperData maFooterData;
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index b2e11864f6b8..88e9db812435 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -672,7 +672,7 @@ public:
const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false );
private:
- typedef ::std::auto_ptr< ::ScPatternAttr > ScPatternAttrPtr;
+ typedef ::std::unique_ptr< ::ScPatternAttr > ScPatternAttrPtr;
ScPatternAttrPtr mpPattern; /// Calc item set.
diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index 0617c2128762..84ff9eaf1cc1 100644
--- a/sc/source/filter/inc/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -41,7 +41,7 @@ public:
inline const FontModel& getDefaultFontModel() const { return *mxDefFontModel; }
private:
- typedef ::std::auto_ptr< FontModel > FontModelPtr;
+ typedef ::std::unique_ptr< FontModel > FontModelPtr;
FontModelPtr mxDefFontModel;
};
diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx
index 1f37603f4133..5c68ff55f185 100644
--- a/sc/source/filter/inc/worksheetfragment.hxx
+++ b/sc/source/filter/inc/worksheetfragment.hxx
@@ -44,7 +44,7 @@ private:
void importDataValidation( SequenceInputStream& rStrm );
private:
- ::std::auto_ptr< ValidationModel > mxValModel;
+ ::std::unique_ptr< ValidationModel > mxValModel;
};
class WorksheetFragment : public WorksheetFragmentBase
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 795208c96f34..1b90097cbccf 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -41,10 +41,8 @@ private:
virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< ::utl::TempFile > mxPicTempFile;
- ::std::auto_ptr< SvStream > mxPicStrm;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< ::utl::TempFile > mxPicTempFile;
+ ::std::unique_ptr< SvStream > mxPicStrm;
};
class XclObj;
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 4cc35769d6fc..e84241ef2478 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -159,7 +159,7 @@ public:
class XclObjComment : public XclObj
{
ScAddress maScPos;
- std::auto_ptr< SdrCaptionObj >
+ std::unique_ptr< SdrCaptionObj >
mpCaption;
bool mbVisible;
Rectangle maFrom;
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index f15a74acc23b..7facf2250029 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -59,9 +59,7 @@ public:
void Progress();
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- typedef ::std::auto_ptr< ScfProgressBar > ScfProgressBarPtr;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr;
ScfProgressBarPtr mxProgress; /// Progress bar implementation.
ScfProgressBar* mpSubProgress; /// Current sub progress bar.
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 9d8453b64b6c..fd7f3e79d6eb 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -266,7 +266,7 @@ struct XclExpNumFmt
};
class SvNumberFormatter;
-typedef ::std::auto_ptr< SvNumberFormatter > SvNumberFormatterPtr;
+typedef ::std::unique_ptr< SvNumberFormatter > SvNumberFormatterPtr;
/** Stores all number formats used in the document. */
class XclExpNumFmtBuffer : public XclExpRecordBase, protected XclExpRoot
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index ba9ff3b1ba92..2e376f94c51a 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -133,7 +133,7 @@ public:
void Apply();
private:
- typedef ::std::auto_ptr< ScConditionalFormat > ScCondFmtPtr;
+ typedef ::std::unique_ptr< ScConditionalFormat > ScCondFmtPtr;
ScRangeList maRanges; /// Destination cell ranges.
ScCondFmtPtr mxScCondFmt; /// Calc conditional format.
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index ce49f0e9ccd7..3e54efe7dc0f 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -177,7 +177,7 @@ public:
sal_Int32 GetTotalHeight() const;
private: // types
- typedef ::std::auto_ptr< XclFontData > XclFontDataPtr;
+ typedef ::std::unique_ptr< XclFontData > XclFontDataPtr;
/** Enumerates the supported header/footer portions. */
enum XclImpHFPortion { EXC_HF_LEFT, EXC_HF_CENTER, EXC_HF_RIGHT, EXC_HF_PORTION_COUNT };
@@ -313,7 +313,7 @@ public:
sal_uInt16 GetScError() const;
protected:
- typedef ::std::auto_ptr< const ScTokenArray > ScTokenArrayPtr;
+ typedef ::std::unique_ptr< const ScTokenArray > ScTokenArrayPtr;
OUString maStr; /// Cached value is a string.
double mfValue; /// Cached value is a double.
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index f3fb721ea2d1..4da2a7025063 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -149,8 +149,8 @@ public:
sal_uInt32 GetStorageId() const { return mnStorageId; }
private:
- typedef ::std::auto_ptr< XclImpCachedMatrix > XclImpCachedMatrixPtr;
- typedef ::std::auto_ptr< ScTokenArray > TokenArrayPtr;
+ typedef ::std::unique_ptr< XclImpCachedMatrix > XclImpCachedMatrixPtr;
+ typedef ::std::unique_ptr< ScTokenArray > TokenArrayPtr;
XclImpCachedMatrixPtr mxDdeMatrix; /// Cached results of the DDE link.
MOper* mpMOper; /// Cached values for OLE link
@@ -219,7 +219,7 @@ public:
const OUString& GetMacroName( sal_uInt16 nExtSheet, sal_uInt16 nExtName ) const;
private:
- typedef ::std::auto_ptr< XclImpLinkManagerImpl > XclImpLinkMgrImplPtr;
+ typedef ::std::unique_ptr< XclImpLinkManagerImpl > XclImpLinkMgrImplPtr;
XclImpLinkMgrImplPtr mxImpl;
};
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 6255b99e44dc..dd08823d0482 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -428,7 +428,7 @@ private:
void SetUsedFlags( sal_uInt8 nUsedFlags );
private:
- typedef ::std::auto_ptr< ScPatternAttr > ScPatternAttrPtr;
+ typedef ::std::unique_ptr< ScPatternAttr > ScPatternAttrPtr;
ScPatternAttrPtr mpPattern; /// Calc item set.
ScStyleSheet* mpStyleSheet; /// Calc cell style sheet.
diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index 9d395ce570cc..f5333b96fcbf 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -91,7 +91,7 @@ class SvxBrushItem;
/** Contains all page (print) settings for a single sheet. */
struct XclPageData : private boost::noncopyable
{
- typedef ::std::auto_ptr< SvxBrushItem > SvxBrushItemPtr;
+ typedef ::std::unique_ptr< SvxBrushItem > SvxBrushItemPtr;
ScfUInt16Vec maHorPageBreaks; /// Horizontal page breaks.
ScfUInt16Vec maVerPageBreaks; /// Vertical page breaks.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 02:10:55 +0000