summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-19 08:40:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-19 09:55:18 +0000
commit8f2522f931df9f1f24ef7016ee64d75fd23af000 (patch)
tree59ad157d1683dc311e8688c5b4193754f0e178b8 /sc
parentc7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce (diff)
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/excdoc.cxx6
-rw-r--r--sc/source/filter/excel/xeescher.cxx10
-rw-r--r--sc/source/filter/inc/commentsbuffer.hxx2
-rw-r--r--sc/source/filter/inc/condformatbuffer.hxx18
-rw-r--r--sc/source/filter/inc/connectionsbuffer.hxx2
-rw-r--r--sc/source/filter/inc/defnamesbuffer.hxx2
-rw-r--r--sc/source/filter/inc/excdoc.hxx6
-rw-r--r--sc/source/filter/inc/excrecds.hxx6
-rw-r--r--sc/source/filter/inc/externallinkbuffer.hxx4
-rw-r--r--sc/source/filter/inc/numberformatsbuffer.hxx2
-rw-r--r--sc/source/filter/inc/richstring.hxx6
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx20
-rw-r--r--sc/source/filter/inc/tablebuffer.hxx2
-rw-r--r--sc/source/filter/inc/viewsettings.hxx4
-rw-r--r--sc/source/filter/inc/xechart.hxx62
-rw-r--r--sc/source/filter/inc/xeescher.hxx18
-rw-r--r--sc/source/filter/inc/xeextlst.hxx20
-rw-r--r--sc/source/filter/inc/xehelper.hxx6
-rw-r--r--sc/source/filter/inc/xerecord.hxx4
-rw-r--r--sc/source/filter/inc/xeroot.hxx42
-rw-r--r--sc/source/filter/inc/xetable.hxx28
-rw-r--r--sc/source/filter/inc/xipivot.hxx16
-rw-r--r--sc/source/filter/inc/xlchart.hxx14
-rw-r--r--sc/source/filter/oox/condformatbuffer.cxx2
-rw-r--r--sc/source/filter/oox/formulabase.cxx2
-rw-r--r--sc/source/filter/oox/worksheetbuffer.cxx4
26 files changed, 154 insertions, 154 deletions
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 7b5d196a605a..2582712fa616 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -75,7 +75,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <oox/token/tokens.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
using namespace oox;
@@ -477,7 +477,7 @@ void ExcTable::FillAsTableBinary( SCTAB nCodeNameIdx )
}
// WSBOOL needs data from page settings, create it here, add it later
- boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
+ std::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
bool bFitToPages = xPageSett->GetPageData().mbFitToPages;
if( eBiff <= EXC_BIFF5 )
@@ -618,7 +618,7 @@ void ExcTable::FillAsTableXml()
}
// WSBOOL needs data from page settings, create it here, add it later
- boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
+ std::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
XclExtLstRef xExtLst( new XclExtLst( GetRoot() ) );
bool bFitToPages = xPageSett->GetPageData().mbFitToPages;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 46ef312e5163..e4366f2821ab 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -78,7 +78,7 @@
#include <oox/export/drawingml.hxx>
#include <oox/export/chartexport.hxx>
#include <oox/export/utils.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
using ::com::sun::star::uno::UNO_QUERY;
@@ -1458,9 +1458,9 @@ XclExpDffAnchorBase* XclExpObjectManager::CreateDffAnchor() const
return new XclExpDffSheetAnchor( GetRoot() );
}
-boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::CreateDrawingGroup()
+std::shared_ptr< XclExpRecordBase > XclExpObjectManager::CreateDrawingGroup()
{
- return boost::shared_ptr< XclExpRecordBase >( new XclExpMsoDrawingGroup( *mxEscherEx ) );
+ return std::shared_ptr< XclExpRecordBase >( new XclExpMsoDrawingGroup( *mxEscherEx ) );
}
void XclExpObjectManager::StartSheet()
@@ -1468,7 +1468,7 @@ void XclExpObjectManager::StartSheet()
mxObjList.reset( new XclExpObjList( GetRoot(), *mxEscherEx ) );
}
-boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPage* pSdrPage )
+std::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPage* pSdrPage )
{
if( pSdrPage )
mxEscherEx->AddSdrPage( *pSdrPage );
@@ -1480,7 +1480,7 @@ boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPa
return mxObjList;
}
-boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const Reference< XShapes >& rxShapes )
+std::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const Reference< XShapes >& rxShapes )
{
if( rxShapes.is() )
mxEscherEx->AddUnoShapes( rxShapes );
diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx
index c63597c6a46c..6c99f47a2543 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -71,7 +71,7 @@ private:
CommentModel maModel;
};
-typedef ::boost::shared_ptr< Comment > CommentRef;
+typedef std::shared_ptr< Comment > CommentRef;
class CommentsBuffer : public WorksheetHelper
{
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index c8d8bfb222c3..e0539e108b1e 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -22,8 +22,8 @@
#include "formulaparser.hxx"
#include "worksheethelper.hxx"
-#include <boost/scoped_ptr.hpp>
#include <tools/color.hxx>
+#include <memory>
class ScColorScaleFormat;
class ScDataBarFormat;
@@ -118,8 +118,8 @@ public:
private:
std::unique_ptr<ScDataBarFormatData> mxFormat;
- boost::scoped_ptr<ColorScaleRuleModelEntry> mpUpperLimit;
- boost::scoped_ptr<ColorScaleRuleModelEntry> mpLowerLimit;
+ std::unique_ptr<ColorScaleRuleModelEntry> mpUpperLimit;
+ std::unique_ptr<ColorScaleRuleModelEntry> mpLowerLimit;
};
class IconSetRule : public WorksheetHelper
@@ -165,12 +165,12 @@ private:
const CondFormat& mrCondFormat;
CondFormatRuleModel maModel;
ScConditionalFormat* mpFormat;
- boost::scoped_ptr<ColorScaleRule> mpColor;
- boost::scoped_ptr<DataBarRule> mpDataBar;
- boost::scoped_ptr<IconSetRule> mpIconSet;
+ std::unique_ptr<ColorScaleRule> mpColor;
+ std::unique_ptr<DataBarRule> mpDataBar;
+ std::unique_ptr<IconSetRule> mpIconSet;
};
-typedef ::boost::shared_ptr< CondFormatRule > CondFormatRuleRef;
+typedef std::shared_ptr< CondFormatRule > CondFormatRuleRef;
/** Model for a conditional formatting object. */
struct CondFormatModel
@@ -256,8 +256,8 @@ public:
ExCfRuleModel& getModel() { return maModel; }
};
-typedef ::boost::shared_ptr< CondFormat > CondFormatRef;
-typedef ::boost::shared_ptr< ExtCfRule > ExtCfRuleRef;
+typedef std::shared_ptr< CondFormat > CondFormatRef;
+typedef std::shared_ptr< ExtCfRule > ExtCfRuleRef;
class CondFormatBuffer : public WorksheetHelper
{
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 03f36d927929..31d67fb01a21 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -124,7 +124,7 @@ private:
ConnectionModel maModel;
};
-typedef ::boost::shared_ptr< Connection > ConnectionRef;
+typedef std::shared_ptr< Connection > ConnectionRef;
class ConnectionsBuffer : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index 09f1579387fc..2ce69753d101 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -148,7 +148,7 @@ private:
sal_uInt16 mnFmlaSize; /// Cached BIFF formula size for formula import.
};
-typedef ::boost::shared_ptr< DefinedName > DefinedNameRef;
+typedef std::shared_ptr< DefinedName > DefinedNameRef;
class DefinedNamesBuffer : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 61880337185c..c1158e8c9f0e 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -24,7 +24,7 @@
#include "xeroot.hxx"
#include "root.hxx"
#include "xeescher.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
// Forwards -
@@ -42,9 +42,9 @@ class ExcTable : public XclExpRecordBase, public XclExpRoot
{
private:
typedef XclExpRecordList< ExcBundlesheetBase > ExcBoundsheetList;
- typedef boost::shared_ptr< XclExpCellTable > XclExpCellTableRef;
+ typedef std::shared_ptr< XclExpCellTable > XclExpCellTableRef;
typedef XclExpRecordList< XclExpNote > XclExpNoteList;
- typedef boost::shared_ptr< XclExpNoteList > XclExpNoteListRef;
+ typedef std::shared_ptr< XclExpNoteList > XclExpNoteListRef;
XclExpRecordList<> aRecList;
XclExpCellTableRef mxCellTable;
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 292b83165926..ba74e5a63461 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -27,7 +27,6 @@
#include <tools/color.hxx>
#include <vcl/vclenum.hxx>
-#include <vector>
#include "olinetab.hxx"
#include "filter.hxx"
#include "rangelst.hxx"
@@ -37,7 +36,8 @@
#include "xestring.hxx"
#include "root.hxx"
#include "excdefs.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <vector>
//------------------------------------------------------------------ Forwards -
@@ -447,7 +447,7 @@ public:
private:
using XclExpRoot::CreateRecord;
- typedef boost::shared_ptr< ExcAutoFilterRecs > XclExpTabFilterRef;
+ typedef std::shared_ptr< ExcAutoFilterRecs > XclExpTabFilterRef;
typedef ::std::map< SCTAB, XclExpTabFilterRef > XclExpTabFilterMap;
XclExpTabFilterMap maFilterMap;
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 6954f1c6e739..28633b7d0404 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -120,7 +120,7 @@ private:
bool mbDdeLinkCreated; /// True = already tried to create the DDE link.
};
-typedef ::boost::shared_ptr< ExternalName > ExternalNameRef;
+typedef std::shared_ptr< ExternalName > ExternalNameRef;
/** Contains indexes for a range of sheets in the spreadsheet document. */
class LinkSheetRange
@@ -278,7 +278,7 @@ private:
ExternalNameVector maExtNames; /// Defined names in external document.
};
-typedef ::boost::shared_ptr< ExternalLink > ExternalLinkRef;
+typedef std::shared_ptr< ExternalLink > ExternalLinkRef;
/** Represents a REF entry in the BIFF12 EXTERNALSHEETS or in the BIFF8
EXTERNSHEET record.
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 3a790753f0d5..c7535e67d1a5 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -80,7 +80,7 @@ private:
ApiNumFmtData maApiData;
};
-typedef ::boost::shared_ptr< NumberFormat > NumberFormatRef;
+typedef std::shared_ptr< NumberFormat > NumberFormatRef;
class NumberFormatsBuffer : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 84a80c15c96b..7dc2eb6302b0 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -82,7 +82,7 @@ private:
bool mbConverted; /// Without repeatly convert
};
-typedef ::boost::shared_ptr< RichStringPortion > RichStringPortionRef;
+typedef std::shared_ptr< RichStringPortion > RichStringPortionRef;
enum BiffFontPortionMode
{
@@ -184,7 +184,7 @@ private:
sal_Int32 mnBaseEnd; /// One-past-end position in base text.
};
-typedef ::boost::shared_ptr< RichStringPhonetic > RichStringPhoneticRef;
+typedef std::shared_ptr< RichStringPhonetic > RichStringPhoneticRef;
/** Represents a phonetic text portion in a rich-string with phonetic text.
Used in binary filters only. */
@@ -282,7 +282,7 @@ private:
PhoneticVector maPhonPortions; /// Phonetic text portions.
};
-typedef ::boost::shared_ptr< RichString > RichStringRef;
+typedef std::shared_ptr< RichString > RichStringRef;
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 4502e042610c..ed78e4877bb3 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -275,7 +275,7 @@ private:
bool mbDxf;
};
-typedef ::boost::shared_ptr< Font > FontRef;
+typedef std::shared_ptr< Font > FontRef;
/** Contains all XML cell alignment attributes, e.g. from an alignment element. */
struct AlignmentModel
@@ -350,7 +350,7 @@ private:
ApiAlignmentData maApiData; /// Alignment data converted to API constants.
};
-typedef ::boost::shared_ptr< Alignment > AlignmentRef;
+typedef std::shared_ptr< Alignment > AlignmentRef;
/** Contains all XML cell protection attributes, e.g. from a protection element. */
struct ProtectionModel
@@ -400,7 +400,7 @@ private:
ApiProtectionData maApiData; /// Protection data converted to API constants.
};
-typedef ::boost::shared_ptr< Protection > ProtectionRef;
+typedef std::shared_ptr< Protection > ProtectionRef;
/** Contains XML attributes of a single border line. */
struct BorderLineModel
@@ -498,7 +498,7 @@ private:
bool mbDxf;
};
-typedef ::boost::shared_ptr< Border > BorderRef;
+typedef std::shared_ptr< Border > BorderRef;
/** Contains XML pattern fill attributes from the patternFill element. */
struct PatternFillModel
@@ -594,8 +594,8 @@ public:
void writeToPropertyMap( PropertyMap& rPropMap ) const;
private:
- typedef ::boost::shared_ptr< PatternFillModel > PatternModelRef;
- typedef ::boost::shared_ptr< GradientFillModel > GradientModelRef;
+ typedef std::shared_ptr< PatternFillModel > PatternModelRef;
+ typedef std::shared_ptr< GradientFillModel > GradientModelRef;
PatternModelRef mxPatternModel;
GradientModelRef mxGradientModel;
@@ -603,7 +603,7 @@ private:
bool mbDxf;
};
-typedef ::boost::shared_ptr< Fill > FillRef;
+typedef std::shared_ptr< Fill > FillRef;
/** Contains all data for a cell format or cell style. */
struct XfModel
@@ -697,7 +697,7 @@ private:
bool operator==( const Xf& rXf1, const Xf& rXf2 );
-typedef ::boost::shared_ptr< Xf > XfRef;
+typedef std::shared_ptr< Xf > XfRef;
class Dxf : public WorkbookHelper
{
@@ -731,7 +731,7 @@ private:
FillRef mxFill; /// Fill data.
};
-typedef ::boost::shared_ptr< Dxf > DxfRef;
+typedef std::shared_ptr< Dxf > DxfRef;
/** Contains attributes of a cell style, e.g. from the cellStyle element. */
struct CellStyleModel
@@ -781,7 +781,7 @@ private:
};
-typedef ::boost::shared_ptr< CellStyle > CellStyleRef;
+typedef std::shared_ptr< CellStyle > CellStyleRef;
class CellStyleBuffer : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx
index 6202acbca2f6..abc0a49bbec0 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -86,7 +86,7 @@ private:
sal_Int32 mnTokenIndex; /// Token index used in API token array.
};
-typedef ::boost::shared_ptr< Table > TableRef;
+typedef std::shared_ptr< Table > TableRef;
class TableBuffer : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx
index dc6e4e6c0cb9..15ba52db8a6a 100644
--- a/sc/source/filter/inc/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -87,7 +87,7 @@ struct SheetViewModel
PaneSelectionModel& createPaneSelection( sal_Int32 nPaneId );
};
-typedef ::boost::shared_ptr< SheetViewModel > SheetViewModelRef;
+typedef std::shared_ptr< SheetViewModel > SheetViewModelRef;
class SheetViewSettings : public WorksheetHelper
{
@@ -145,7 +145,7 @@ struct WorkbookViewModel
explicit WorkbookViewModel();
};
-typedef ::boost::shared_ptr< WorkbookViewModel > WorkbookViewModelRef;
+typedef std::shared_ptr< WorkbookViewModel > WorkbookViewModelRef;
class ViewSettings : public WorkbookHelper
{
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index b962e7699717..c38925f18cdb 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -26,8 +26,8 @@
#include "xlstyle.hxx"
#include "xeroot.hxx"
#include "xestring.hxx"
-#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
+#include <memory>
class Size;
class Rectangle;
@@ -150,7 +150,7 @@ protected:
void FinalizeFutureRecBlock( XclExpStream& rStrm );
private:
- typedef boost::shared_ptr< XclExpChRootData > XclExpChRootDataRef;
+ typedef std::shared_ptr< XclExpChRootData > XclExpChRootDataRef;
XclExpChRootDataRef mxChData; /// Reference to the root data object.
};
@@ -213,7 +213,7 @@ private:
XclChFramePos maData; /// Position of the frame.
};
-typedef boost::shared_ptr< XclExpChFramePos > XclExpChFramePosRef;
+typedef std::shared_ptr< XclExpChFramePos > XclExpChFramePosRef;
class XclExpChLineFormat : public XclExpRecord
{
@@ -246,7 +246,7 @@ private:
sal_uInt32 mnColorId; /// Line color identifier.
};
-typedef boost::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef;
+typedef std::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef;
class XclExpChAreaFormat : public XclExpRecord
{
@@ -278,7 +278,7 @@ private:
sal_uInt32 mnBackColorId; /// Pattern background color identifier.
};
-typedef boost::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef;
+typedef std::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef;
class XclExpChEscherFormat : public XclExpChGroupBase
{
@@ -311,7 +311,7 @@ private:
sal_uInt32 mnColor2Id; /// Second fill color identifier.
};
-typedef boost::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef;
+typedef std::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef;
/** Base class for record groups containing frame formatting.
@@ -378,7 +378,7 @@ private:
XclChObjectType meObjType; /// Type of the represented object.
};
-typedef boost::shared_ptr< XclExpChFrame > XclExpChFrameRef;
+typedef std::shared_ptr< XclExpChFrame > XclExpChFrameRef;
// Source links ===============================================================
@@ -417,7 +417,7 @@ private:
XclExpStringRef mxString; /// Text data (CHSTRING record).
};
-typedef boost::shared_ptr< XclExpChSourceLink > XclExpChSourceLinkRef;
+typedef std::shared_ptr< XclExpChSourceLink > XclExpChSourceLinkRef;
// Text =======================================================================
@@ -428,7 +428,7 @@ public:
explicit XclExpChFont( sal_uInt16 nFontIdx );
};
-typedef boost::shared_ptr< XclExpChFont > XclExpChFontRef;
+typedef std::shared_ptr< XclExpChFont > XclExpChFontRef;
/** The CHOBJECTLINK record linking a text object to a specific chart object. */
class XclExpChObjectLink : public XclExpRecord
@@ -443,7 +443,7 @@ private:
XclChObjectLink maData; /// Contents of the CHOBJECTLINK record.
};
-typedef boost::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef;
+typedef std::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef;
/** Additional data label settings in the future record CHFRLABELPROPS. */
class XclExpChFrLabelProps : public XclExpChFutureRecordBase
@@ -464,7 +464,7 @@ private:
XclChFrLabelProps maData; /// Contents of the CHFRLABELPROPS record.
};
-typedef boost::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef;
+typedef std::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef;
/** Base class for objects with font settings. Provides font conversion helper functions. */
class XclExpChFontBase
@@ -536,7 +536,7 @@ private:
sal_uInt32 mnTextColorId; /// Text color identifier.
};
-typedef boost::shared_ptr< XclExpChText > XclExpChTextRef;
+typedef std::shared_ptr< XclExpChText > XclExpChTextRef;
// Data series ================================================================
@@ -572,7 +572,7 @@ private:
sal_uInt32 mnFillColorId; /// Fill color identifier.
};
-typedef boost::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef;
+typedef std::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef;
/** The CHPIEFORMAT record containing data point formatting data for pie segments. */
class XclExpChPieFormat : public XclExpUInt16Record
@@ -584,7 +584,7 @@ public:
void Convert( const ScfPropertySet& rPropSet );
};
-typedef boost::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef;
+typedef std::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef;
/** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */
class XclExpCh3dDataFormat : public XclExpRecord
@@ -602,7 +602,7 @@ private:
XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record.
};
-typedef boost::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef;
+typedef std::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef;
/** The CHATTACHEDLABEL record that contains the type of a data point label. */
class XclExpChAttachedLabel : public XclExpUInt16Record
@@ -611,7 +611,7 @@ public:
explicit XclExpChAttachedLabel( sal_uInt16 nFlags );
};
-typedef boost::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef;
+typedef std::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef;
/** Represents the CHDATAFORMAT record group containing data point properties.
@@ -650,7 +650,7 @@ private:
XclExpChAttLabelRef mxAttLabel; /// Data point label type (CHATTACHEDLABEL record).
};
-typedef boost::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef;
+typedef std::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef;
/** Represents the CHSERTRENDLINE record containing settings for a trend line. */
class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot
@@ -678,7 +678,7 @@ private:
XclExpChTextRef mxLabel; /// Formatting of the equation text box.
};
-typedef boost::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef;
+typedef std::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef;
/** Represents the CHSERERRORBAR record containing settings for error bars. */
class XclExpChSerErrorBar : public XclExpRecord, protected XclExpChRoot
@@ -696,7 +696,7 @@ private:
XclChSerErrorBar maData; /// Contents of the CHSERERRORBAR record.
};
-typedef boost::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef;
+typedef std::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef;
/** Represents the CHSERIES record group describing a data series in a chart.
@@ -768,7 +768,7 @@ private:
sal_uInt16 mnParentIdx; /// 0-based index of parent series (trend lines and error bars).
};
-typedef boost::shared_ptr< XclExpChSeries > XclExpChSeriesRef;
+typedef std::shared_ptr< XclExpChSeries > XclExpChSeriesRef;
// Chart type groups ==========================================================
@@ -822,7 +822,7 @@ private:
XclChChart3d maData; /// Contents of the CHCHART3D record.
};
-typedef boost::shared_ptr< XclExpChChart3d > XclExpChChart3dRef;
+typedef std::shared_ptr< XclExpChChart3d > XclExpChChart3dRef;
/** Represents the CHLEGEND record group describing the chart legend.
@@ -850,7 +850,7 @@ private:
XclExpChFrameRef mxFrame; /// Legend frame format (CHFRAME group).
};
-typedef boost::shared_ptr< XclExpChLegend > XclExpChLegendRef;
+typedef std::shared_ptr< XclExpChLegend > XclExpChLegendRef;
/** Represents the CHDROPBAR record group describing pos/neg bars in line charts.
@@ -876,7 +876,7 @@ private:
sal_uInt16 mnBarDist; /// Distance between bars (CHDROPBAR record).
};
-typedef boost::shared_ptr< XclExpChDropBar > XclExpChDropBarRef;
+typedef std::shared_ptr< XclExpChDropBar > XclExpChDropBarRef;
/** Represents the CHTYPEGROUP record group describing a group of series.
@@ -955,7 +955,7 @@ private:
XclExpChLineFormatMap maChartLines; /// Global line formats (CHCHARTLINE group).
};
-typedef boost::shared_ptr< XclExpChTypeGroup > XclExpChTypeGroupRef;
+typedef std::shared_ptr< XclExpChTypeGroup > XclExpChTypeGroupRef;
// Axes =======================================================================
@@ -982,7 +982,7 @@ private:
XclChDateRange maDateData; /// Contents of the CHDATERANGE record.
};
-typedef boost::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef;
+typedef std::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef;
class XclExpChValueRange : public XclExpRecord, protected XclExpChRoot
{
@@ -1001,7 +1001,7 @@ private:
XclChValueRange maData; /// Contents of the CHVALUERANGE record.
};
-typedef boost::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef;
+typedef std::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef;
class XclExpChTick : public XclExpRecord, protected XclExpChRoot
{
@@ -1023,7 +1023,7 @@ private:
sal_uInt32 mnTextColorId; /// Axis labels text color identifier.
};
-typedef boost::shared_ptr< XclExpChTick > XclExpChTickRef;
+typedef std::shared_ptr< XclExpChTick > XclExpChTickRef;
/** Represents the CHAXIS record group describing an entire chart axis.
@@ -1076,7 +1076,7 @@ private:
sal_uInt16 mnNumFmtIdx; /// Index into number format buffer (CHFORMAT record).
};
-typedef boost::shared_ptr< XclExpChAxis > XclExpChAxisRef;
+typedef std::shared_ptr< XclExpChAxis > XclExpChAxisRef;
/** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes).
@@ -1138,7 +1138,7 @@ private:
XclExpChTypeGroupList maTypeGroups; /// Chart type groups (CHTYPEGROUP group).
};
-typedef boost::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef;
+typedef std::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef;
// The chart object ===========================================================
@@ -1201,8 +1201,8 @@ public:
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- boost::shared_ptr< XclExpObjectManager > mxObjMgr;
- boost::shared_ptr< XclExpRecordBase > mxObjRecs;
+ std::shared_ptr< XclExpObjectManager > mxObjMgr;
+ std::shared_ptr< XclExpRecordBase > mxObjRecs;
};
/** Represents the entire chart substream (all records in BOF/EOF block). */
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 2279b002dc54..6ef12e5de038 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -26,8 +26,8 @@
#include "xlescher.hxx"
#include <com/sun/star/chart/XChartDocument.hpp>
#include <svx/sdtaitm.hxx>
-#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
+#include <memory>
class ScPostIt;
@@ -304,7 +304,7 @@ public:
const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const;
private:
- typedef boost::shared_ptr< XclExpChart > XclExpChartRef;
+ typedef std::shared_ptr< XclExpChart > XclExpChartRef;
XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
XShapeRef mxShape;
XChartDocRef mxChartDoc;
@@ -393,17 +393,17 @@ public:
/** Creates and returns the MSODRAWINGGROUP record containing global DFF
data in the DGGCONTAINER. */
- boost::shared_ptr< XclExpRecordBase > CreateDrawingGroup();
+ std::shared_ptr< XclExpRecordBase > CreateDrawingGroup();
/** Initializes the object manager for a new sheet. */
void StartSheet();
/** Processes a drawing page and returns the record block containing all
related records (MSODRAWING, OBJ, TXO, charts, etc.). */
- boost::shared_ptr< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage );
+ std::shared_ptr< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage );
/** Processes a collection of UNO shapes and returns the record block
containing all related records (MSODRAWING, OBJ, TXO, charts, etc.). */
- boost::shared_ptr< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+ std::shared_ptr< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
/** Finalizes the object manager after conversion of all sheets. */
void EndDocument();
@@ -421,10 +421,10 @@ private:
void InitStream( bool bTempFile );
private:
- boost::shared_ptr< ::utl::TempFile > mxTempFile;
- boost::shared_ptr< SvStream > mxDffStrm;
- boost::shared_ptr< XclEscherEx > mxEscherEx;
- boost::shared_ptr< XclExpObjList > mxObjList;
+ std::shared_ptr< ::utl::TempFile > mxTempFile;
+ std::shared_ptr< SvStream > mxDffStrm;
+ std::shared_ptr< XclEscherEx > mxEscherEx;
+ std::shared_ptr< XclExpObjList > mxObjList;
};
class XclExpEmbeddedObjectManager : public XclExpObjectManager
diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx
index dcf09c1ea7f2..d65c9a75a639 100644
--- a/sc/source/filter/inc/xeextlst.hxx
+++ b/sc/source/filter/inc/xeextlst.hxx
@@ -15,7 +15,7 @@
#include "colorscale.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
enum XclExpExtType
{
@@ -79,14 +79,14 @@ private:
databar::ScAxisPosition meAxisPosition;
bool mbGradient;
- boost::scoped_ptr<XclExpExtCfvo> mpLowerLimit;
- boost::scoped_ptr<XclExpExtCfvo> mpUpperLimit;
- boost::scoped_ptr<XclExpExtNegativeColor> mpNegativeColor;
- boost::scoped_ptr<XclExpExtAxisColor> mpAxisColor;
+ std::unique_ptr<XclExpExtCfvo> mpLowerLimit;
+ std::unique_ptr<XclExpExtCfvo> mpUpperLimit;
+ std::unique_ptr<XclExpExtNegativeColor> mpNegativeColor;
+ std::unique_ptr<XclExpExtAxisColor> mpAxisColor;
};
-typedef boost::shared_ptr<XclExpExtDataBar> XclExpExtDataBarRef;
+typedef std::shared_ptr<XclExpExtDataBar> XclExpExtDataBarRef;
class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot
{
@@ -99,8 +99,8 @@ private:
OString maId;
};
-typedef boost::shared_ptr<XclExpExt> XclExpExtRef;
-typedef boost::shared_ptr<XclExpExtCfRule> XclExpExtCfRuleRef;
+typedef std::shared_ptr<XclExpExt> XclExpExtRef;
+typedef std::shared_ptr<XclExpExtCfRule> XclExpExtCfRuleRef;
class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExpRoot
{
@@ -113,7 +113,7 @@ private:
ScRangeList maRange;
};
-typedef boost::shared_ptr<XclExpExtConditionalFormatting> XclExpExtConditionalFormattingRef;
+typedef std::shared_ptr<XclExpExtConditionalFormatting> XclExpExtConditionalFormattingRef;
class XclExpExtCondFormat : public XclExpExt
{
@@ -143,7 +143,7 @@ private:
XclExpRecordList< XclExpExt > maExtEntries;
};
-typedef boost::shared_ptr< XclExtLst > XclExtLstRef;
+typedef std::shared_ptr< XclExtLst > XclExtLstRef;
#endif
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index 7facf2250029..a55cae54da2f 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_XEHELPER_HXX
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "xladdress.hxx"
#include "xeroot.hxx"
#include "xestring.hxx"
@@ -59,7 +59,7 @@ public:
void Progress();
private:
- typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr;
+ typedef std::unique_ptr< ScfProgressBar > ScfProgressBarPtr;
ScfProgressBarPtr mxProgress; /// Progress bar implementation.
ScfProgressBar* mpSubProgress; /// Current sub progress bar.
@@ -175,7 +175,7 @@ class XclExpHyperlink;
class XclExpHyperlinkHelper : protected XclExpRoot
{
public:
- typedef boost::shared_ptr< XclExpHyperlink > XclExpHyperlinkRef;
+ typedef std::shared_ptr< XclExpHyperlink > XclExpHyperlinkRef;
explicit XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos );
virtual ~XclExpHyperlinkHelper();
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index b8f5760954e0..f1e516f79096 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -22,7 +22,7 @@
#include "xlconst.hxx"
#include "xestream.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
// Base classes to export Excel records =======================================
@@ -300,7 +300,7 @@ template< typename RecType = XclExpRecordBase >
class XclExpRecordList : public XclExpRecordBase
{
public:
- typedef boost::shared_ptr< RecType > RecordRefType;
+ typedef std::shared_ptr< RecType > RecordRefType;
inline bool IsEmpty() const { return maRecs.empty(); }
inline size_t GetSize() const { return maRecs.size(); }
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 2272134933d6..3bd970f8b388 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -24,15 +24,15 @@
#include "xlroot.hxx"
#include "compiler.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
// Forward declarations of objects in public use ==============================
class XclExpRecordBase;
class XclExpString;
-typedef boost::shared_ptr< XclExpRecordBase > XclExpRecordRef;
-typedef boost::shared_ptr< XclExpString > XclExpStringRef;
+typedef std::shared_ptr< XclExpRecordBase > XclExpRecordRef;
+typedef std::shared_ptr< XclExpString > XclExpStringRef;
// Global data ================================================================
@@ -57,22 +57,22 @@ namespace sc { class CompileFormulaContext; }
/** Stores global buffers and data needed for Excel export filter. */
struct XclExpRootData : public XclRootData
{
- typedef boost::shared_ptr< XclExpTabInfo > XclExpTabInfoRef;
- typedef boost::shared_ptr< XclExpAddressConverter > XclExpAddrConvRef;
- typedef boost::shared_ptr< XclExpFormulaCompiler > XclExpFmlaCompRef;
- typedef boost::shared_ptr< XclExpProgressBar > XclExpProgressRef;
-
- typedef boost::shared_ptr< XclExpSst > XclExpSstRef;
- typedef boost::shared_ptr< XclExpPalette > XclExpPaletteRef;
- typedef boost::shared_ptr< XclExpFontBuffer > XclExpFontBfrRef;
- typedef boost::shared_ptr< XclExpNumFmtBuffer > XclExpNumFmtBfrRef;
- typedef boost::shared_ptr< XclExpXFBuffer > XclExpXFBfrRef;
- typedef boost::shared_ptr< XclExpNameManager > XclExpNameMgrRef;
- typedef boost::shared_ptr< XclExpLinkManager > XclExpLinkMgrRef;
- typedef boost::shared_ptr< XclExpObjectManager > XclExpObjectMgrRef;
- typedef boost::shared_ptr< XclExpFilterManager > XclExpFilterMgrRef;
- typedef boost::shared_ptr< XclExpPivotTableManager > XclExpPTableMgrRef;
- typedef boost::shared_ptr< XclExpDxfs > XclExpDxfsRef;
+ typedef std::shared_ptr< XclExpTabInfo > XclExpTabInfoRef;
+ typedef std::shared_ptr< XclExpAddressConverter > XclExpAddrConvRef;
+ typedef std::shared_ptr< XclExpFormulaCompiler > XclExpFmlaCompRef;
+ typedef std::shared_ptr< XclExpProgressBar > XclExpProgressRef;
+
+ typedef std::shared_ptr< XclExpSst > XclExpSstRef;
+ typedef std::shared_ptr< XclExpPalette > XclExpPaletteRef;
+ typedef std::shared_ptr< XclExpFontBuffer > XclExpFontBfrRef;
+ typedef std::shared_ptr< XclExpNumFmtBuffer > XclExpNumFmtBfrRef;
+ typedef std::shared_ptr< XclExpXFBuffer > XclExpXFBfrRef;
+ typedef std::shared_ptr< XclExpNameManager > XclExpNameMgrRef;
+ typedef std::shared_ptr< XclExpLinkManager > XclExpLinkMgrRef;
+ typedef std::shared_ptr< XclExpObjectManager > XclExpObjectMgrRef;
+ typedef std::shared_ptr< XclExpFilterManager > XclExpFilterMgrRef;
+ typedef std::shared_ptr< XclExpPivotTableManager > XclExpPTableMgrRef;
+ typedef std::shared_ptr< XclExpDxfs > XclExpDxfsRef;
XclExpTabInfoRef mxTabInfo; /// Calc->Excel sheet index conversion.
XclExpAddrConvRef mxAddrConv; /// The address converter.
@@ -92,8 +92,8 @@ struct XclExpRootData : public XclRootData
XclExpPTableMgrRef mxPTableMgr; /// All pivot tables and pivot caches.
XclExpDxfsRef mxDxfs; /// All delta formatting entries
- boost::shared_ptr<XclExpXmlPivotTableManager> mxXmlPTableMgr;
- boost::shared_ptr<sc::CompileFormulaContext> mpCompileFormulaCxt;
+ std::shared_ptr<XclExpXmlPivotTableManager> mxXmlPTableMgr;
+ std::shared_ptr<sc::CompileFormulaContext> mpCompileFormulaCxt;
ScCompiler::OpCodeMapPtr mxOpCodeMap; /// mapping between op-codes and names
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 9e16e775a66e..091f56694e76 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -31,10 +31,10 @@
#include "xestyle.hxx"
#include "xeextlst.hxx"
-#include <boost/shared_ptr.hpp>
#include <map>
-#include <unordered_set>
+#include <memory>
#include <unordered_map>
+#include <unordered_set>
/* ============================================================================
Export of cell tables including row and column description.
@@ -92,7 +92,7 @@ protected:
XclAddress maBaseXclPos; /// Address of base cell (first FORMULA record).
};
-typedef boost::shared_ptr< XclExpRangeFmlaBase > XclExpRangeFmlaRef;
+typedef std::shared_ptr< XclExpRangeFmlaBase > XclExpRangeFmlaRef;
// Array formulas =============================================================
@@ -122,7 +122,7 @@ private:
XclTokenArrayRef mxTokArr; /// The token array of a matrix formula.
};
-typedef boost::shared_ptr< XclExpArray > XclExpArrayRef;
+typedef std::shared_ptr< XclExpArray > XclExpArrayRef;
/** Caches all ARRAY records. */
class XclExpArrayBuffer : protected XclExpRoot
@@ -171,7 +171,7 @@ private:
sal_uInt8 mnUsedCount; /// Number of FORMULA records referring to this record.
};
-typedef boost::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef;
+typedef std::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef;
/** Caches all SHRFMLA records and provides functions to update their ranges. */
class XclExpShrfmlaBuffer : protected XclExpRoot
@@ -244,7 +244,7 @@ private:
bool mbValid; /// true = Contains valid references.
};
-typedef boost::shared_ptr< XclExpTableop > XclExpTableopRef;
+typedef std::shared_ptr< XclExpTableop > XclExpTableopRef;
/** Contains all created TABLEOP records and supports creating or updating them. */
class XclExpTableopBuffer : protected XclExpRoot
@@ -316,7 +316,7 @@ private:
XclAddress maXclPos; /// Address of the cell.
};
-typedef boost::shared_ptr< XclExpCellBase > XclExpCellRef;
+typedef std::shared_ptr< XclExpCellBase > XclExpCellRef;
// Single cell records ========================================================
@@ -945,7 +945,7 @@ private:
XclExpRow& GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty );
private:
- typedef ::boost::shared_ptr<XclExpRow> RowRef;
+ typedef std::shared_ptr<XclExpRow> RowRef;
typedef ::std::map<sal_uInt32, RowRef> RowMap;
RowMap maRowMap;
@@ -1005,12 +1005,12 @@ private:
typedef XclExpRecordList< XclExpNote > XclExpNoteList;
typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList;
- typedef boost::shared_ptr< XclExpDefrowheight > XclExpDefrowhRef;
- typedef boost::shared_ptr< XclExpNoteList > XclExpNoteListRef;
- typedef boost::shared_ptr< XclExpMergedcells > XclExpMergedcellsRef;
- typedef boost::shared_ptr< XclExpHyperlinkList > XclExpHyperlinkRef;
- typedef boost::shared_ptr< XclExpDval > XclExpDvalRef;
- typedef boost::shared_ptr< XclExtLst > XclExtLstRef;
+ typedef std::shared_ptr< XclExpDefrowheight > XclExpDefrowhRef;
+ typedef std::shared_ptr< XclExpNoteList > XclExpNoteListRef;
+ typedef std::shared_ptr< XclExpMergedcells > XclExpMergedcellsRef;
+ typedef std::shared_ptr< XclExpHyperlinkList > XclExpHyperlinkRef;
+ typedef std::shared_ptr< XclExpDval > XclExpDvalRef;
+ typedef std::shared_ptr< XclExtLst > XclExtLstRef;
XclExpColinfoBuffer maColInfoBfr; /// Buffer for column formatting.
XclExpRowBuffer maRowBfr; /// Rows and cell records.
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index affc88370b99..dce979515f41 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XIPIVOT_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XIPIVOT_HXX
-#include <list>
#include "xlpivot.hxx"
#include "xiroot.hxx"
-#include <boost/shared_ptr.hpp>
+#include <list>
+#include <memory>
class ScDPSaveData;
class ScDPSaveDimension;
@@ -56,7 +56,7 @@ private:
void ReadSxempty( XclImpStream& rStrm );
};
-typedef boost::shared_ptr< XclImpPCItem > XclImpPCItemRef;
+typedef std::shared_ptr< XclImpPCItem > XclImpPCItemRef;
struct ScDPNumGroupInfo;
class XclImpPivotCache;
@@ -138,7 +138,7 @@ private:
bool mbNumGroupInfoRead; /// true = Numeric grouping info read (SXNUMGROUP record).
};
-typedef boost::shared_ptr< XclImpPCField > XclImpPCFieldRef;
+typedef std::shared_ptr< XclImpPCField > XclImpPCFieldRef;
class XclImpPivotCache : protected XclImpRoot
{
@@ -192,7 +192,7 @@ private:
bool mbSelfRef; /// true = Source data from own document.
};
-typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef;
+typedef std::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef;
// Pivot table
@@ -217,7 +217,7 @@ private:
const XclImpPCField* mpCacheField; /// Corresponding pivot cache field.
};
-typedef boost::shared_ptr< XclImpPTItem > XclImpPTItemRef;
+typedef std::shared_ptr< XclImpPTItem > XclImpPTItemRef;
class XclImpPTField
{
@@ -291,7 +291,7 @@ private:
XclImpPTItemVec maItems; /// List of all items of this field.
};
-typedef boost::shared_ptr< XclImpPTField > XclImpPTFieldRef;
+typedef std::shared_ptr< XclImpPTField > XclImpPTFieldRef;
class XclImpPivotTable : protected XclImpRoot
{
@@ -362,7 +362,7 @@ private:
ScDPObject* mpDPObj;
};
-typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef;
+typedef std::shared_ptr< XclImpPivotTable > XclImpPivotTableRef;
/** The main class for pivot table import.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 1d7f72cc754d..a527284042aa 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -25,10 +25,10 @@
// disable/enable restriction to hair lines in 3D bar charts (#i83151#)
#define EXC_CHART2_3DBAR_HAIRLINES_ONLY 1
-#include <map>
#include <tools/gen.hxx>
#include "fapihelper.hxx"
-#include <boost/shared_ptr.hpp>
+#include <map>
+#include <memory>
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
@@ -807,8 +807,8 @@ class EscherPropertyContainer;
struct XclChEscherFormat
{
- typedef boost::shared_ptr< SfxItemSet > SfxItemSetRef;
- typedef boost::shared_ptr< EscherPropertyContainer > EscherPropSetRef;
+ typedef std::shared_ptr< SfxItemSet > SfxItemSetRef;
+ typedef std::shared_ptr< EscherPropertyContainer > EscherPropSetRef;
SfxItemSetRef mxItemSet; /// Item set for Escher properties import.
EscherPropSetRef mxEscherSet; /// Container for Escher properties export.
@@ -1402,9 +1402,9 @@ private:
/** Base struct for internal root data structs for import and export. */
struct XclChRootData
{
- typedef boost::shared_ptr< XclChTypeInfoProvider > XclChTypeProvRef;
- typedef boost::shared_ptr< XclChFormatInfoProvider > XclChFmtInfoProvRef;
- typedef boost::shared_ptr< XclChObjectTable > XclChObjectTableRef;
+ typedef std::shared_ptr< XclChTypeInfoProvider > XclChTypeProvRef;
+ typedef std::shared_ptr< XclChFormatInfoProvider > XclChFmtInfoProvRef;
+ typedef std::shared_ptr< XclChObjectTable > XclChObjectTableRef;
typedef ::std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 5d5f32b8cbf4..511e02e0e90f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -791,7 +791,7 @@ void CondFormatRule::finalizeImport()
else if( (eOperator != SC_COND_NONE) && !maModel.maFormulas.empty() )
{
ScDocument& rDoc = getScDocument();
- boost::scoped_ptr<ScTokenArray> pTokenArray2;
+ std::unique_ptr<ScTokenArray> pTokenArray2;
if( maModel.maFormulas.size() >= 2)
{
pTokenArray2.reset(new ScTokenArray());
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 690231b24928..40d282f941fb 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -225,7 +225,7 @@ const sal_uInt16 FUNCFLAG_INTERNAL = 0x2000; /// Function is internal
/// Extracts a function library index (value of enum FunctionLibraryType) from function flags.
#define FUNCFLAGS_TO_FUNCLIB( func_flags ) extractValue< FunctionLibraryType >( func_flags, 12, 4 )
-typedef ::boost::shared_ptr< FunctionInfo > FunctionInfoRef;
+typedef std::shared_ptr< FunctionInfo > FunctionInfoRef;
struct FunctionData
{
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 23282c1c6ecf..4f3bec9461f7 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -200,7 +200,7 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr
// return final sheet index if sheet exists
return IndexNamePair( nCalcSheet, aSheetName );
}
- catch( Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "WorksheetBuffer::createSheet - cannot insert or rename worksheet" );
}
@@ -211,7 +211,7 @@ void WorksheetBuffer::insertSheet( const SheetInfoModel& rModel )
{
sal_Int32 nWorksheet = static_cast< sal_Int32 >( maSheetInfos.size() );
IndexNamePair aIndexName = createSheet( rModel.maName, nWorksheet, rModel.mnState == XML_visible );
- ::boost::shared_ptr< SheetInfo > xSheetInfo( new SheetInfo( rModel, aIndexName.first, aIndexName.second ) );
+ std::shared_ptr< SheetInfo > xSheetInfo( new SheetInfo( rModel, aIndexName.first, aIndexName.second ) );
maSheetInfos.push_back( xSheetInfo );
maSheetInfosByName[ rModel.maName ] = xSheetInfo;
maSheetInfosByName[ lclQuoteName( rModel.maName ) ] = xSheetInfo;