From c8204ba5b86d080aa5ac3ec71dc6aaea1384b9a0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 18 Sep 2015 09:08:35 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7f3bb094f116103c1146a7d60e3af94c0b37d9ea Reviewed-on: https://gerrit.libreoffice.org/18677 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/inc/cellsuno.hxx | 4 ++-- sc/inc/chart2uno.hxx | 11 +++++------ sc/inc/chartlis.hxx | 9 ++++----- sc/inc/clipcontext.hxx | 4 ++-- sc/inc/colorscale.hxx | 18 +++++++++--------- sc/inc/conditio.hxx | 6 +++--- sc/inc/dbdata.hxx | 10 ++++------ sc/inc/dociter.hxx | 7 ++----- sc/inc/document.hxx | 30 ++++++++++++++---------------- sc/inc/documentstreamaccess.hxx | 4 ++-- sc/inc/dpcache.hxx | 6 +++--- sc/inc/dpfilteredcache.hxx | 4 ++-- sc/inc/dpgroup.hxx | 8 ++++---- sc/inc/dpobject.hxx | 4 ++-- sc/inc/dpsave.hxx | 12 ++++++------ sc/inc/dptabsrc.hxx | 8 ++++---- sc/inc/editdataarray.hxx | 6 +++--- sc/inc/externalrefmgr.hxx | 6 +++--- sc/inc/fielduno.hxx | 4 ++-- sc/inc/importfilterdata.hxx | 4 ++-- sc/inc/listenercontext.hxx | 13 ++++++------- sc/inc/pch/precompiled_sc.hxx | 2 -- sc/inc/pch/precompiled_scfilt.hxx | 2 -- sc/inc/pch/precompiled_scui.hxx | 1 - sc/inc/pch/precompiled_vbaobj.hxx | 1 - sc/inc/postit.hxx | 4 ++-- sc/inc/simpleformulacalc.hxx | 4 ++-- sc/inc/simplerangelist.hxx | 7 +++---- sc/inc/table.hxx | 16 ++++++++-------- sc/inc/tabprotection.hxx | 6 +++--- 30 files changed, 102 insertions(+), 119 deletions(-) (limited to 'sc/inc') diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index d721b29b092d..f36c3cf751ae 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -89,8 +89,8 @@ #include #include #include -#include +#include #include class ScDocShell; @@ -506,7 +506,7 @@ class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, { private: struct Impl; - ::boost::scoped_ptr m_pImpl; + std::unique_ptr m_pImpl; ScCellRangeObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 68387a608f53..54cfd98f5fac 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -47,11 +47,10 @@ #include #include +#include #include #include -#include #include -#include class ScDocument; @@ -453,9 +452,9 @@ private: bool m_bIncludeHiddenCells; // internals - typedef boost::scoped_ptr > TokenListPtr; - typedef boost::scoped_ptr > RangeIndexMapPtr; - typedef boost::scoped_ptr ExtRefListenerPtr; + typedef std::unique_ptr > TokenListPtr; + typedef std::unique_ptr > RangeIndexMapPtr; + typedef std::unique_ptr ExtRefListenerPtr; sal_Int64 m_nObjectId; ScDocument* m_pDocument; @@ -465,7 +464,7 @@ private: com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; SfxItemPropertySet m_aPropSet; - boost::scoped_ptr m_pHiddenListener; + std::unique_ptr m_pHiddenListener; ScLinkListener* m_pValueListener; XModifyListenerArr_Impl m_aValueListeners; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 8b29b9933d26..b634b91602e9 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -27,12 +27,11 @@ #include "token.hxx" #include "externalrefmgr.hxx" -#include - -#include #include +#include #include #include +#include class ScDocument; class ScChartUnoData; @@ -62,8 +61,8 @@ public: private: - boost::scoped_ptr mpExtRefListener; - boost::scoped_ptr > mpTokens; + std::unique_ptr mpExtRefListener; + std::unique_ptr > mpTokens; OUString maName; ScChartUnoData* pUnoData; diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx index 787b964a699b..783c6bd49728 100644 --- a/sc/inc/clipcontext.hxx +++ b/sc/inc/clipcontext.hxx @@ -14,9 +14,9 @@ #include "cellvalue.hxx" #include +#include #include #include -#include class ScDocument; class ScColumn; @@ -31,7 +31,7 @@ class ColumnBlockPositionSet; class ClipContextBase : boost::noncopyable { - boost::scoped_ptr mpSet; + std::unique_ptr mpSet; ClipContextBase(); // disabled diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 5514e0269016..e0884c757b6d 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -11,7 +11,6 @@ #define INCLUDED_SC_INC_COLORSCALE_HXX #include -#include #include #include #include "rangelst.hxx" @@ -20,6 +19,7 @@ #include #include +#include #include //TODO: merge this with conditio.hxx @@ -50,8 +50,8 @@ class SC_DLLPUBLIC ScColorScaleEntry private: double mnVal; Color maColor; - boost::scoped_ptr mpCell; - boost::scoped_ptr mpListener; + std::unique_ptr mpCell; + std::unique_ptr mpListener; ScColorScaleEntryType meType; public: @@ -133,7 +133,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData * * Default color is 0xFF0000, this value is not set */ - boost::scoped_ptr mpNegativeColor; + std::unique_ptr mpNegativeColor; /** * Color of the axis if used * Default color is black @@ -177,8 +177,8 @@ struct SC_DLLPUBLIC ScDataBarFormatData */ bool mbOnlyBar; - boost::scoped_ptr mpUpperLimit; - boost::scoped_ptr mpLowerLimit; + std::unique_ptr mpUpperLimit; + std::unique_ptr mpLowerLimit; }; enum ScIconSetType @@ -242,7 +242,7 @@ private: { std::vector maValues; }; - mutable boost::scoped_ptr mpCache; + mutable std::unique_ptr mpCache; }; typedef std::vector> ScColorScaleEntries; @@ -323,7 +323,7 @@ private: double getMin(double nMin, double nMax) const; double getMax(double nMin, double nMax) const; - boost::scoped_ptr mpFormatData; + std::unique_ptr mpFormatData; }; struct ScIconSetFormatData @@ -396,7 +396,7 @@ private: double GetMaxValue() const; double CalcValue(double nMin, double nMax, ScIconSetFormat::const_iterator& itr) const; - boost::scoped_ptr mpFormatData; + std::unique_ptr mpFormatData; }; #endif diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 5893585bb0da..839c5b0080ae 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -32,10 +32,10 @@ #include #include +#include #include #include -#include class ScFormulaCell; class ScTokenArray; @@ -280,7 +280,7 @@ private: nValueItems(0) {} }; - mutable boost::scoped_ptr mpCache; + mutable std::unique_ptr mpCache; }; // single condition entry for conditional formatting @@ -370,7 +370,7 @@ public: private: condformat::ScCondFormatDateType meType; - mutable boost::scoped_ptr mpCache; + mutable std::unique_ptr mpCache; OUString maStyleName; }; diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 1f825e75e956..8d136411dfe5 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -28,8 +28,6 @@ #include -#include - #include #include #include @@ -65,10 +63,10 @@ protected: class ScDBData : public SvtListener, public ScRefreshTimer { private: - boost::scoped_ptr mpSortParam; - boost::scoped_ptr mpQueryParam; - boost::scoped_ptr mpSubTotal; - boost::scoped_ptr mpImportParam; + std::unique_ptr mpSortParam; + std::unique_ptr mpQueryParam; + std::unique_ptr mpSubTotal; + std::unique_ptr mpImportParam; ScDBDataContainerBase* mpContainer; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 49a782e3fe3c..013a6e290956 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -30,11 +30,8 @@ #include #include - #include #include -#include -#include class ScDocument; class ScPatternAttr; @@ -271,7 +268,7 @@ class ScQueryCellIterator // walk through all non-empty cells in an ar typedef sc::CellStoreType::const_position_type PositionType; PositionType maCurPos; - boost::scoped_ptr mpParam; + std::unique_ptr mpParam; ScDocument* pDoc; const ScAttrArray* pAttrArray; sal_uLong nNumFormat; @@ -587,7 +584,7 @@ public: struct TabRanges { SCTAB mnTab; - ::boost::shared_ptr mpRanges; + std::shared_ptr mpRanges; TabRanges(SCTAB nTab); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 7016d7f88911..afa2b7eaebd3 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include "markdata.hxx" @@ -275,7 +273,7 @@ friend class sc::ColumnSpanSet; friend class sc::EditTextIterator; friend class sc::FormulaGroupAreaListener; - typedef ::std::vector TableContainer; + typedef std::vector TableContainer; public: enum HardRecalcState @@ -289,9 +287,9 @@ private: rtl::Reference xPoolHelper; - boost::shared_ptr mpCellStringPool; - boost::scoped_ptr mpFormulaGroupCxt; - mutable boost::scoped_ptr mpDocLinkMgr; + std::shared_ptr mpCellStringPool; + std::unique_ptr mpFormulaGroupCxt; + mutable std::unique_ptr mpDocLinkMgr; ScCalcConfig maCalcConfig; @@ -333,14 +331,14 @@ private: ScFieldEditEngine* pCacheFieldEditEngine; - ::std::unique_ptr pDocProtection; - ::std::unique_ptr mpClipParam; + std::unique_ptr pDocProtection; + std::unique_ptr mpClipParam; - ::std::unique_ptr pExternalRefMgr; - ::std::unique_ptr mpMacroMgr; + std::unique_ptr pExternalRefMgr; + std::unique_ptr mpMacroMgr; // mutable for lazy construction - mutable ::std::unique_ptr< ScFormulaParserPool > + mutable std::unique_ptr< ScFormulaParserPool > mxFormulaParserPool; /// Pool for all external formula parsers used by this document. OUString aDocName; // optional: name of document @@ -469,7 +467,7 @@ private: sal_Int16 mnNamedRangesLockCount; - ::std::set maSubTotalCells; + std::set maSubTotalCells; bool mbUseEmbedFonts; @@ -591,8 +589,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); - SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); - void SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRanges ); + SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); + void SetChartRanges( const OUString& rChartName, const std::vector< ScRangeList >& rRanges ); void UpdateChartArea( const OUString& rChartName, const ScRange& rNewArea, bool bColHeaders, bool bRowHeaders, bool bAdd ); @@ -1603,8 +1601,8 @@ public: SC_DLLPUBLIC sal_uInt8 GetColFlags( SCCOL nCol, SCTAB nTab ) const; SC_DLLPUBLIC sal_uInt8 GetRowFlags( SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC void GetAllRowBreaks(::std::set& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; - SC_DLLPUBLIC void GetAllColBreaks(::std::set& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; + SC_DLLPUBLIC void GetAllRowBreaks(std::set& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; + SC_DLLPUBLIC void GetAllColBreaks(std::set& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; SC_DLLPUBLIC ScBreakType HasRowBreak(SCROW nRow, SCTAB nTab) const; SC_DLLPUBLIC ScBreakType HasColBreak(SCCOL nCol, SCTAB nTab) const; SC_DLLPUBLIC void SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual); diff --git a/sc/inc/documentstreamaccess.hxx b/sc/inc/documentstreamaccess.hxx index 52335df7735b..81e0fbca728c 100644 --- a/sc/inc/documentstreamaccess.hxx +++ b/sc/inc/documentstreamaccess.hxx @@ -11,7 +11,7 @@ #define INCLUDED_SC_INC_DOCUMENTSTREAMACCESS_HXX #include -#include +#include class ScDocument; class ScAddress; @@ -27,7 +27,7 @@ struct DocumentStreamAccessImpl; */ class DocumentStreamAccess { - boost::scoped_ptr mpImpl; + std::unique_ptr mpImpl; DocumentStreamAccess(); diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index b778086bee77..799c8c34b110 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -25,13 +25,13 @@ #include #include -#include #include #include +#include +#include #include #include -#include struct ScQueryParam; class ScDPObject; @@ -67,7 +67,7 @@ public: /** * Optional items for grouped field. */ - boost::scoped_ptr mpGroup; + std::unique_ptr mpGroup; /** * Unique values in the field, stored in ascending order. diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 8ec5f8bd19fc..857ab7661d27 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -26,9 +26,9 @@ #include "dpitemdata.hxx" #include "calcmacros.hxx" +#include #include #include -#include #include @@ -95,7 +95,7 @@ public: struct Criterion { sal_Int32 mnFieldIndex; - ::boost::shared_ptr mpFilter; + std::shared_ptr mpFilter; Criterion(); }; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index e59b38a44a4c..805affeff6cb 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_SC_INC_DPGROUP_HXX #define INCLUDED_SC_INC_DPGROUP_HXX +#include #include #include -#include #include "dptabdat.hxx" #include "scdllapi.h" @@ -121,7 +121,7 @@ class ScDPGroupTableData : public ScDPTableData { typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet; - ::boost::shared_ptr pSourceData; + std::shared_ptr pSourceData; long nSourceCount; ScDPGroupDimensionVec aGroups; ScDPNumGroupDimension* pNumGroups; // array[nSourceCount] @@ -138,10 +138,10 @@ class ScDPGroupTableData : public ScDPTableData public: // takes ownership of pSource - ScDPGroupTableData( const ::boost::shared_ptr& pSource, ScDocument* pDocument ); + ScDPGroupTableData( const std::shared_ptr& pSource, ScDocument* pDocument ); virtual ~ScDPGroupTableData(); - boost::shared_ptr GetSourceTableData() { return pSourceData;} + std::shared_ptr GetSourceTableData() { return pSourceData;} void AddGroupDimension( const ScDPGroupDimension& rGroup ); void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup ); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index a167194683a2..dd0a3c973962 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -30,13 +30,13 @@ #include +#include #include #include #include #include #include -#include namespace com { namespace sun { namespace star { @@ -92,7 +92,7 @@ private: ScSheetSourceDesc* pSheetDesc; // for sheet data ScImportSourceDesc* pImpDesc; // for database data ScDPServiceDesc* pServDesc; // for external service - ::boost::shared_ptr mpTableData; + std::shared_ptr mpTableData; // cached data com::sun::star::uno::Reference xSource; ScDPOutput* pOutput; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 9973b991faee..c81a690f78cf 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -21,9 +21,9 @@ #define INCLUDED_SC_INC_DPSAVE_HXX #include +#include #include -#include #include #include @@ -52,7 +52,7 @@ class ScDPSaveMember { private: OUString aName; - boost::scoped_ptr mpLayoutName; // custom name to be displayed in the table. + std::unique_ptr mpLayoutName; // custom name to be displayed in the table. sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; @@ -98,8 +98,8 @@ class SC_DLLPUBLIC ScDPSaveDimension { private: OUString aName; - boost::scoped_ptr mpLayoutName; - boost::scoped_ptr mpSubtotalName; + std::unique_ptr mpLayoutName; + std::unique_ptr mpSubtotalName; bool bIsDataLayout; bool bDupFlag; sal_uInt16 nOrientation; @@ -258,8 +258,8 @@ private: * created. */ bool mbDimensionMembersBuilt; - boost::scoped_ptr mpGrandTotalName; - mutable boost::scoped_ptr mpDimOrder; // dimension order for row and column dimensions, to traverse result tree. + std::unique_ptr mpGrandTotalName; + mutable std::unique_ptr mpDimOrder; // dimension order for row and column dimensions, to traverse result tree. public: SC_DLLPUBLIC ScDPSaveData(); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index cdae3af4f413..4f63a8258861 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -48,8 +48,8 @@ #include "dpresfilter.hxx" #include -#include #include +#include #include #include #include @@ -319,8 +319,8 @@ class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper< long nUsedHier; sal_uInt16 nFunction; // enum GeneralFunction OUString aName; // if empty, take from source - boost::scoped_ptr mpLayoutName; - boost::scoped_ptr mpSubtotalName; + std::unique_ptr mpLayoutName; + std::unique_ptr mpSubtotalName; long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" @@ -732,7 +732,7 @@ private: long nLev; SCROW mnDataId; - boost::scoped_ptr mpLayoutName; + std::unique_ptr mpLayoutName; sal_Int32 nPosition; // manual sorting bool bVisible; diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx index e13a4b1c6f20..a917dcdbb640 100644 --- a/sc/inc/editdataarray.hxx +++ b/sc/inc/editdataarray.hxx @@ -23,8 +23,8 @@ #include "address.hxx" #include +#include #include -#include class EditTextObject; @@ -48,8 +48,8 @@ public: Item(); // disabled private: - ::boost::shared_ptr mpOldData; - ::boost::shared_ptr mpNewData; + std::shared_ptr mpOldData; + std::shared_ptr mpNewData; SCTAB mnTab; SCCOL mnCol; SCROW mnRow; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index be513510ac6d..bb8b44cba0b5 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ class ScExternalRefCache { public: typedef ::formula::FormulaTokenRef TokenRef; - typedef ::boost::shared_ptr TokenArrayRef; + typedef std::shared_ptr TokenArrayRef; struct TableName { @@ -198,7 +198,7 @@ public: ReferencedFlag meReferenced; }; - typedef ::boost::shared_ptr TableTypeRef; + typedef std::shared_ptr
TableTypeRef; typedef std::unordered_map< OUString, size_t, OUStringHash> TableNameIndexMap; diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 905e907953f5..ed2e72c961e8 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -40,7 +40,7 @@ #include #include -#include +#include class ScEditSource; class SvxFieldItem; @@ -207,7 +207,7 @@ class ScEditFieldObj : public cppu::WeakImplHelper< ESelection aSelection; sal_Int32 meType; - boost::scoped_ptr mpData; + std::unique_ptr mpData; com::sun::star::uno::Reference mpContent; com::sun::star::util::DateTime maDateTime; diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx index 089f427d2bfc..8ea1473114f8 100644 --- a/sc/inc/importfilterdata.hxx +++ b/sc/inc/importfilterdata.hxx @@ -13,7 +13,7 @@ #include "address.hxx" #include -#include +#include namespace sc { @@ -39,7 +39,7 @@ struct ImportPostProcessData : boost::noncopyable DataStream(); }; - boost::scoped_ptr mpDataStream; + std::unique_ptr mpDataStream; }; } diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx index 000a5beca7e7..fe40dea10127 100644 --- a/sc/inc/listenercontext.hxx +++ b/sc/inc/listenercontext.hxx @@ -14,8 +14,7 @@ #include "columnspanset.hxx" #include -#include -#include +#include class ScDocument; class ScTokenArray; @@ -28,10 +27,10 @@ class ColumnBlockPositionSet; class StartListeningContext : boost::noncopyable { ScDocument& mrDoc; - boost::shared_ptr mpSet; + std::shared_ptr mpSet; public: StartListeningContext(ScDocument& rDoc); - StartListeningContext(ScDocument& rDoc, const boost::shared_ptr& pSet); + StartListeningContext(ScDocument& rDoc, const std::shared_ptr& pSet); ScDocument& getDoc() { return mrDoc;} ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol); @@ -41,13 +40,13 @@ class EndListeningContext : boost::noncopyable { ScDocument& mrDoc; ColumnSpanSet maSet; - boost::shared_ptr mpPosSet; + std::shared_ptr mpPosSet; ScTokenArray* mpOldCode; ScAddress maPosDelta; // Add this to get the old position prior to the move. public: EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = NULL); - EndListeningContext(ScDocument& rDoc, const boost::shared_ptr& pSet, ScTokenArray* pOldCode = NULL); + EndListeningContext(ScDocument& rDoc, const std::shared_ptr& pSet, ScTokenArray* pOldCode = NULL); void setPositionDelta( const ScAddress& rDelta ); @@ -64,7 +63,7 @@ public: class PurgeListenerAction : public ColumnSpanSet::Action, boost::noncopyable { ScDocument& mrDoc; - boost::scoped_ptr mpBlockPos; + std::unique_ptr mpBlockPos; public: PurgeListenerAction( ScDocument& rDoc ); diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 9f6258bca087..4a0a1e9e4025 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -42,8 +42,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index 32480a7c3ef2..5eb13baa217b 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -23,8 +23,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx index fbd83f1a8c0a..4b7fd177bb42 100644 --- a/sc/inc/pch/precompiled_scui.hxx +++ b/sc/inc/pch/precompiled_scui.hxx @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx index 130a34cf90fc..90120f43e004 100644 --- a/sc/inc/pch/precompiled_vbaobj.hxx +++ b/sc/inc/pch/precompiled_vbaobj.hxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 7a376d22e064..98a89f7329c5 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_SC_INC_POSTIT_HXX #define INCLUDED_SC_INC_POSTIT_HXX -#include #include #include "address.hxx" #include "scdllapi.h" #include +#include class EditTextObject; class OutlinerParaObject; @@ -39,7 +39,7 @@ struct ScCaptionInitData; /** Internal data for a cell annotation. */ struct SC_DLLPUBLIC ScNoteData { - typedef ::boost::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; + typedef std::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; OUString maDate; /// Creation date of the note. OUString maAuthor; /// Author of the note. diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx index f12e26165eba..081823de12ce 100644 --- a/sc/inc/simpleformulacalc.hxx +++ b/sc/inc/simpleformulacalc.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX #define INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX -#include +#include #include #include "address.hxx" @@ -26,7 +26,7 @@ private: sal_uLong mnFormatIndex; bool mbCalculated; - boost::scoped_ptr mpCode; + std::unique_ptr mpCode; ScAddress maAddr; ScDocument* mpDoc; ScFormulaResult maResult; diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx index 1fcbefd9d832..bf672ea19f12 100644 --- a/sc/inc/simplerangelist.hxx +++ b/sc/inc/simplerangelist.hxx @@ -20,12 +20,11 @@ #ifndef INCLUDED_SC_INC_SIMPLERANGELIST_HXX #define INCLUDED_SC_INC_SIMPLERANGELIST_HXX -#include - #include "address.hxx" -#include #include +#include +#include class ScRange; class ScRangeList; @@ -47,7 +46,7 @@ public: SCROW mnRow2; explicit Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); }; - typedef ::boost::shared_ptr< ::std::list > RangeListRef; + typedef std::shared_ptr< ::std::list > RangeListRef; typedef ::std::map TabType; ScSimpleRangeList(); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 77330b3d4367..8a12532f1f86 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include namespace utl { @@ -140,17 +140,17 @@ private: SCROW nRepeatStartY; SCROW nRepeatEndY; - boost::scoped_ptr pTabProtection; + std::unique_ptr pTabProtection; sal_uInt16* pColWidth; - boost::scoped_ptr mpRowHeights; + std::unique_ptr mpRowHeights; sal_uInt8* pColFlags; ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags; - boost::scoped_ptr mpHiddenCols; - boost::scoped_ptr mpHiddenRows; - boost::scoped_ptr mpFilteredCols; - boost::scoped_ptr mpFilteredRows; + std::unique_ptr mpHiddenCols; + std::unique_ptr mpHiddenRows; + std::unique_ptr mpFilteredCols; + std::unique_ptr mpFilteredRows; ::std::set maRowPageBreaks; ::std::set maRowManualBreaks; @@ -188,7 +188,7 @@ private: ScDBData* pDBDataNoName; mutable ScRangeName* mpRangeName; - boost::scoped_ptr mpCondFormatList; + std::unique_ptr mpCondFormatList; bool bScenario:1; bool bLayoutRTL:1; diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index 1458399fd9c2..07aecaa7dcad 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -25,7 +25,7 @@ #include "global.hxx" #include "rangelst.hxx" -#include +#include class ScDocument; class ScTableProtectionImpl; @@ -103,7 +103,7 @@ public: void setOption(Option eOption, bool bEnabled); private: - ::boost::scoped_ptr mpImpl; + std::unique_ptr mpImpl; }; /** Container for the Excel EnhancedProtection feature. @@ -195,7 +195,7 @@ public: bool isSelectionEditable( const ScRangeList& rRangeList ) const; private: - ::boost::scoped_ptr mpImpl; + std::unique_ptr mpImpl; }; #endif -- cgit