diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-19 08:40:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-19 09:55:18 +0000 |
commit | 8f2522f931df9f1f24ef7016ee64d75fd23af000 (patch) | |
tree | 59ad157d1683dc311e8688c5b4193754f0e178b8 /oox/inc | |
parent | c7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce (diff) |
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'oox/inc')
-rw-r--r-- | oox/inc/drawingml/chart/chartdrawingfragment.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/converterbase.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/objectformatter.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/table/tablestylelist.hxx | 4 | ||||
-rw-r--r-- | oox/inc/drawingml/textfield.hxx | 5 | ||||
-rw-r--r-- | oox/inc/drawingml/textparagraph.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/textparagraphproperties.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/textparagraphpropertiescontext.hxx | 4 | ||||
-rw-r--r-- | oox/inc/drawingml/textrun.hxx | 2 |
9 files changed, 12 insertions, 13 deletions
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx index b2d48df71b65..654bc9a7a73f 100644 --- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx @@ -73,7 +73,7 @@ private: bool mbRelSize; /// True = relative size, false = absolute size. }; -typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef; +typedef std::shared_ptr< ShapeAnchor > ShapeAnchorRef; diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx index f414b6290fbe..bf3f7b5a303e 100644 --- a/oox/inc/drawingml/chart/converterbase.hxx +++ b/oox/inc/drawingml/chart/converterbase.hxx @@ -95,7 +95,7 @@ protected: void convertTitlePositions(); private: - ::boost::shared_ptr< ConverterData > mxData; + std::shared_ptr< ConverterData > mxData; }; diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx index d3a6a6d1668c..731b1501fcb8 100644 --- a/oox/inc/drawingml/chart/objectformatter.hxx +++ b/oox/inc/drawingml/chart/objectformatter.hxx @@ -144,7 +144,7 @@ public: static bool isAutomaticFill( const ModelRef< Shape >& rxShapeProp ); private: - ::boost::shared_ptr< ObjectFormatterData > mxData; + std::shared_ptr< ObjectFormatterData > mxData; }; diff --git a/oox/inc/drawingml/table/tablestylelist.hxx b/oox/inc/drawingml/table/tablestylelist.hxx index 624a453ded19..bf7243e69cdd 100644 --- a/oox/inc/drawingml/table/tablestylelist.hxx +++ b/oox/inc/drawingml/table/tablestylelist.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX #include <rtl/ustring.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> namespace oox { namespace drawingml { namespace table { @@ -45,7 +45,7 @@ private: }; -typedef boost::shared_ptr< TableStyleList > TableStyleListPtr; +typedef std::shared_ptr< TableStyleList > TableStyleListPtr; } } } diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx index 80ac53f0e7f2..9fd0d641a725 100644 --- a/oox/inc/drawingml/textfield.hxx +++ b/oox/inc/drawingml/textfield.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX #define INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX -#include <boost/shared_ptr.hpp> - #include <drawingml/textrun.hxx> #include <drawingml/textparagraphproperties.hxx> +#include <memory> namespace oox { namespace drawingml { @@ -54,7 +53,7 @@ private: OUString msUuid; }; -typedef boost::shared_ptr< TextField > TextFieldPtr; +typedef std::shared_ptr< TextField > TextFieldPtr; } } diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx index c419a65d8cff..d3e93d431023 100644 --- a/oox/inc/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -63,7 +63,7 @@ private: TextRunVector maRuns; }; -typedef boost::shared_ptr< TextParagraph > TextParagraphPtr; +typedef std::shared_ptr< TextParagraph > TextParagraphPtr; } } diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index e6ba58987bd3..c864d2c0fbaf 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -36,7 +36,7 @@ namespace oox { namespace drawingml { class TextParagraphProperties; -typedef boost::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr; +typedef std::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr; class BulletList { diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx index 6f5fbc5983ed..cf666a4d260c 100644 --- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx +++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx @@ -44,8 +44,8 @@ protected: TextParagraphProperties& mrTextParagraphProperties; TextSpacing maLineSpacing; BulletList& mrBulletList; - ::std::list< ::com::sun::star::style::TabStop > maTabList; - ::boost::shared_ptr< BlipFillProperties > mxBlipProps; + std::list< ::com::sun::star::style::TabStop > maTabList; + std::shared_ptr< BlipFillProperties > mxBlipProps; }; } } diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx index 1b77465f08ed..cba32da1baaa 100644 --- a/oox/inc/drawingml/textrun.hxx +++ b/oox/inc/drawingml/textrun.hxx @@ -54,7 +54,7 @@ private: bool mbIsLineBreak; }; -typedef boost::shared_ptr< TextRun > TextRunPtr; +typedef std::shared_ptr< TextRun > TextRunPtr; } } |