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 /include | |
parent | c7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce (diff) |
boost->std
Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775
Diffstat (limited to 'include')
24 files changed, 82 insertions, 81 deletions
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index 20c7c8526719..a65c17e61763 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -21,12 +21,12 @@ #define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX #include <com/sun/star/xml/sax/XFastContextHandler.hpp> -#include <boost/shared_ptr.hpp> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> #include <oox/dllapi.h> +#include <memory> namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XLocator; } } @@ -48,7 +48,7 @@ class ContextHandler; typedef ::rtl::Reference< ContextHandler > ContextHandlerRef; struct FragmentBaseData; -typedef ::boost::shared_ptr< FragmentBaseData > FragmentBaseDataRef; +typedef std::shared_ptr< FragmentBaseData > FragmentBaseDataRef; typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE; diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 551e4d4e85a5..6e4b27d98fb0 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX #define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> #include <oox/helper/attributelist.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/core/contexthandler.hxx> @@ -201,8 +201,8 @@ private: void processCollectedChars(); private: - typedef ::std::vector< ElementInfo > ContextStack; - typedef ::boost::shared_ptr< ContextStack > ContextStackRef; + typedef std::vector< ElementInfo > ContextStack; + typedef std::shared_ptr< ContextStack > ContextStackRef; ContextStackRef mxContextStack; ///< Stack of all processed elements. size_t mnRootStackSize; ///< Stack size on construction time. diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index e33cb9378e44..96391a4ddc51 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_OOX_CORE_RELATIONS_HXX #define INCLUDED_OOX_CORE_RELATIONS_HXX -#include <map> -#include <boost/shared_ptr.hpp> #include <oox/helper/helper.hxx> #include <oox/dllapi.h> +#include <map> +#include <memory> namespace oox { namespace core { @@ -66,7 +66,7 @@ struct Relation class Relations; -typedef ::boost::shared_ptr< Relations > RelationsRef; +typedef std::shared_ptr< Relations > RelationsRef; class OOX_DLLPUBLIC Relations { diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index b6bc9687b198..a28af8630417 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -44,7 +44,7 @@ namespace oox { namespace drawingml { namespace chart { class ChartConverter; } } namespace drawingml { namespace table { class TableStyleList; - typedef boost::shared_ptr< TableStyleList > TableStyleListPtr; + typedef std::shared_ptr< TableStyleList > TableStyleListPtr; } } namespace vml { class Drawing; } } diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 68bb9b7e5b24..6819e512449a 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -31,11 +31,11 @@ namespace drawingml { namespace chart { template< typename ModelType > -class ModelRef : public ::boost::shared_ptr< ModelType > +class ModelRef : public std::shared_ptr< ModelType > { public: ModelRef() {} - ModelRef( const ::boost::shared_ptr< ModelType >& rxModel ) : ::boost::shared_ptr< ModelType >( rxModel ) {} + ModelRef( const std::shared_ptr< ModelType >& rxModel ) : std::shared_ptr< ModelType >( rxModel ) {} ~ModelRef() {} bool is() const { return this->get() != 0; } diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx index 352f5682ebac..d4303749b701 100644 --- a/include/oox/drawingml/clrscheme.hxx +++ b/include/oox/drawingml/clrscheme.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX #define INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include <vector> #include <oox/drawingml/color.hxx> #include <oox/dllapi.h> @@ -38,7 +38,7 @@ public: void setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken ); }; -typedef boost::shared_ptr< ClrMap > ClrMapPtr; +typedef std::shared_ptr< ClrMap > ClrMapPtr; class OOX_DLLPUBLIC ClrScheme { @@ -53,7 +53,7 @@ public: void setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor ); }; -typedef boost::shared_ptr< ClrScheme > ClrSchemePtr; +typedef std::shared_ptr< ClrScheme > ClrSchemePtr; } } diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 54318fa21fc9..9b52bf3e18a0 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_OOX_DRAWINGML_COLOR_HXX #define INCLUDED_OOX_DRAWINGML_COLOR_HXX -#include <vector> -#include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <sal/types.h> @@ -29,6 +27,8 @@ #include <rtl/ustring.hxx> #include <oox/helper/helper.hxx> #include <oox/dllapi.h> +#include <memory> +#include <vector> namespace oox { class GraphicHelper; } @@ -150,7 +150,7 @@ private: maInteropTransformations; /// Unaltered list of transformations for interoperability purposes }; -typedef boost::shared_ptr< Color > ColorPtr; +typedef std::shared_ptr< Color > ColorPtr; diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 2287c668d1ae..621695b550d9 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -21,7 +21,6 @@ #define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX #include <memory> -#include <boost/shared_ptr.hpp> #include <com/sun/star/style/TabAlign.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/Hatch.hpp> @@ -47,43 +46,43 @@ const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; struct LineProperties; -typedef ::boost::shared_ptr< LineProperties > LinePropertiesPtr; +typedef std::shared_ptr< LineProperties > LinePropertiesPtr; struct FillProperties; -typedef ::boost::shared_ptr< FillProperties > FillPropertiesPtr; +typedef std::shared_ptr< FillProperties > FillPropertiesPtr; struct GraphicProperties; -typedef ::boost::shared_ptr< GraphicProperties > GraphicPropertiesPtr; +typedef std::shared_ptr< GraphicProperties > GraphicPropertiesPtr; struct Shape3DProperties; -typedef ::boost::shared_ptr< Shape3DProperties > Shape3DPropertiesPtr; +typedef std::shared_ptr< Shape3DProperties > Shape3DPropertiesPtr; struct TextCharacterProperties; -typedef ::boost::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; +typedef std::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; struct TextBodyProperties; struct EffectProperties; -typedef ::boost::shared_ptr< EffectProperties > EffectPropertiesPtr; +typedef std::shared_ptr< EffectProperties > EffectPropertiesPtr; class TextBody; -typedef ::boost::shared_ptr< TextBody > TextBodyPtr; +typedef std::shared_ptr< TextBody > TextBodyPtr; class TextListStyle; -typedef boost::shared_ptr< TextListStyle > TextListStylePtr; +typedef std::shared_ptr< TextListStyle > TextListStylePtr; class Shape; typedef std::shared_ptr< Shape > ShapePtr; class Theme; -typedef ::boost::shared_ptr< Theme > ThemePtr; +typedef std::shared_ptr< Theme > ThemePtr; namespace table { class TableProperties; -typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr; +typedef std::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 5bdb01f05d02..b1e486ea2203 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -25,7 +25,7 @@ #include <stack> #include <set> #include <map> -#include <boost/shared_ptr.hpp> +#include <memory> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -151,7 +151,7 @@ public: ::oox::BinaryInputStreamRef( new BinaryXInputStream( rxInStrm, true ) ) {} template< typename StreamType > - /*implicit*/ BinaryInputStreamRef( const ::boost::shared_ptr< StreamType >& rxInStrm ) : + /*implicit*/ BinaryInputStreamRef( const std::shared_ptr< StreamType >& rxInStrm ) : ::oox::BinaryInputStreamRef( rxInStrm ) {} }; @@ -447,7 +447,7 @@ static const String EMPTY_STRING; class Base; -typedef ::boost::shared_ptr< Base > BaseRef; +typedef std::shared_ptr< Base > BaseRef; /** Base class for all dumper classes. @@ -557,7 +557,7 @@ class SharedConfigData; class Config; class NameListBase; -typedef ::boost::shared_ptr< NameListBase > NameListRef; +typedef std::shared_ptr< NameListBase > NameListRef; /** Base class of all classes providing names for specific values (name lists). @@ -848,7 +848,7 @@ public: const OUString* getOption( const OUString& rKey ) const; template< typename ListType > - ::boost::shared_ptr< ListType > createNameList( const OUString& rListName ); + std::shared_ptr< ListType > createNameList( const OUString& rListName ); void setNameList( const OUString& rListName, const NameListRef& rxList ); void eraseNameList( const OUString& rListName ); NameListRef getNameList( const OUString& rListName ) const; @@ -888,9 +888,9 @@ private: template< typename ListType > -::boost::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) +std::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) { - ::boost::shared_ptr< ListType > xList; + std::shared_ptr< ListType > xList; if( !rListName.isEmpty() ) { xList.reset( new ListType( *this ) ); @@ -937,7 +937,7 @@ public: bool isImportEnabled() const; template< typename ListType > - ::boost::shared_ptr< ListType > createNameList( const String& rListName ); + std::shared_ptr< ListType > createNameList( const String& rListName ); void eraseNameList( const String& rListName ); NameListRef getNameList( const String& rListName ) const; @@ -967,11 +967,11 @@ protected: NameListRef implGetNameList( const OUString& rListName ) const; private: - typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; + typedef std::shared_ptr< SharedConfigData > SharedConfigDataRef; SharedConfigDataRef mxCfgData; }; -typedef ::boost::shared_ptr< Config > ConfigRef; +typedef std::shared_ptr< Config > ConfigRef; @@ -985,7 +985,7 @@ Type Config::getIntOption( const String& rKey, Type nDefault ) const } template< typename ListType > -::boost::shared_ptr< ListType > Config::createNameList( const String& rListName ) +std::shared_ptr< ListType > Config::createNameList( const String& rListName ) { return mxCfgData->createNameList< ListType >( rListName ); } @@ -1093,7 +1093,7 @@ private: sal_Int32 mnLastItem; }; -typedef ::boost::shared_ptr< Output > OutputRef; +typedef std::shared_ptr< Output > OutputRef; @@ -1217,7 +1217,7 @@ private: ConfigRef mxConfig; }; -typedef ::boost::shared_ptr< ObjectBase > ObjectRef; +typedef std::shared_ptr< ObjectBase > ObjectRef; @@ -1710,7 +1710,7 @@ private: void constructTextStrmObj( rtl_TextEncoding eTextEnc ); protected: - ::boost::shared_ptr< TextInputStream > mxTextStrm; + std::shared_ptr< TextInputStream > mxTextStrm; }; @@ -1820,7 +1820,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; private: - typedef ::boost::shared_ptr< StreamDataSequence > StreamDataSeqRef; + typedef std::shared_ptr< StreamDataSequence > StreamDataSeqRef; StreamDataSeqRef mxRecData; }; diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index f597fa15ef4b..3a9e7b0b082a 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -87,7 +87,7 @@ private: bool readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue ); private: - typedef ::boost::shared_ptr< SequenceInputStream > SequenceInputStreamRef; + typedef std::shared_ptr< SequenceInputStream > SequenceInputStreamRef; SequenceInputStreamRef mxBiffStrm; NameListRef mxErrCodes; diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 0c876ecadbef..38f5857b78f5 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -224,7 +224,7 @@ protected: BinaryInputStream() : BinaryStreamBase( false ) {} }; -typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef; +typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index d8f4f0ee35a9..03ec5ff6a65d 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -21,9 +21,9 @@ #define INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX #include <com/sun/star/uno/Sequence.hxx> -#include <boost/shared_ptr.hpp> #include <oox/helper/helper.hxx> #include <oox/dllapi.h> +#include <memory> namespace com { namespace sun { namespace star { namespace io { class XSeekable; } diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index d529974ce0d9..da998010f591 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_HELPER_PROGRESSBAR_HXX #define INCLUDED_OOX_HELPER_PROGRESSBAR_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <com/sun/star/uno/Reference.hxx> #include <oox/dllapi.h> @@ -60,7 +60,7 @@ public: class ISegmentProgressBar; -typedef ::boost::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; +typedef std::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; /** Interface for a segment in a progress bar, that is able to create sub segments from itself. diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index d2bcd6215536..e3efbfa4f961 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_OOX_HELPER_REFMAP_HXX #define INCLUDED_OOX_HELPER_REFMAP_HXX +#include <sal/types.h> +#include <algorithm> #include <map> +#include <memory> #include <boost/bind.hpp> -#include <boost/shared_ptr.hpp> -#include <sal/types.h> namespace oox { @@ -32,15 +33,15 @@ namespace oox { /** Template for a map of ref-counted objects with additional accessor functions. An instance of the class RefMap< Type > stores elements of the type - ::boost::shared_ptr< Type >. The new accessor functions has() and get() + std::shared_ptr< Type >. The new accessor functions has() and get() work correctly for nonexisting keys, there is no need to check the passed key before. */ -template< typename KeyType, typename ObjType, typename CompType = ::std::less< KeyType > > -class RefMap : public ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType > +template< typename KeyType, typename ObjType, typename CompType = std::less< KeyType > > +class RefMap : public std::map< KeyType, std::shared_ptr< ObjType >, CompType > { public: - typedef ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType > container_type; + typedef std::map< KeyType, std::shared_ptr< ObjType >, CompType > container_type; typedef typename container_type::key_type key_type; typedef typename container_type::mapped_type mapped_type; typedef typename container_type::value_type value_type; @@ -68,7 +69,7 @@ public: template< typename FunctorType > void forEach( const FunctorType& rFunctor ) const { - ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) ); + std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) ); } /** Calls the passed member function of ObjType on every contained object, @@ -117,7 +118,7 @@ public: template< typename FunctorType > void forEachWithKey( const FunctorType& rFunctor ) const { - ::std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) ); + std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) ); } /** Calls the passed member function of ObjType on every contained object. diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index 0b3595279ff4..c5b13d5c9a2e 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_OOX_HELPER_REFVECTOR_HXX #define INCLUDED_OOX_HELPER_REFVECTOR_HXX -#include <vector> -#include <boost/bind.hpp> -#include <boost/shared_ptr.hpp> #include <sal/types.h> +#include <boost/bind.hpp> +#include <algorithm> +#include <memory> +#include <vector> namespace oox { @@ -32,15 +33,15 @@ namespace oox { /** Template for a vector of ref-counted objects with additional accessor functions. An instance of the class RefVector< Type > stores elements of the type - ::boost::shared_ptr< Type >. The new accessor functions has() and get() + std::shared_ptr< Type >. The new accessor functions has() and get() work correctly for indexes out of the current range, there is no need to check the passed index before. */ template< typename ObjType > -class RefVector : public ::std::vector< ::boost::shared_ptr< ObjType > > +class RefVector : public ::std::vector< std::shared_ptr< ObjType > > { public: - typedef ::std::vector< ::boost::shared_ptr< ObjType > > container_type; + typedef ::std::vector< std::shared_ptr< ObjType > > container_type; typedef typename container_type::value_type value_type; typedef typename container_type::size_type size_type; diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 2e3ef05333a9..52196dab93c1 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -37,7 +37,7 @@ namespace oox { class StorageBase; -typedef ::boost::shared_ptr< StorageBase > StorageRef; +typedef std::shared_ptr< StorageBase > StorageRef; /** Base class for storage access implementations. diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 6e267d667a43..24321e94d4bf 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_OOX_OLE_AXCONTROL_HXX #define INCLUDED_OOX_OLE_AXCONTROL_HXX -#include <boost/shared_ptr.hpp> #include <oox/helper/binarystreambase.hxx> #include <oox/helper/propertyset.hxx> #include <oox/ole/axbinaryreader.hxx> #include <oox/ole/olehelper.hxx> #include <oox/dllapi.h> +#include <memory> namespace com { namespace sun { namespace star { namespace awt { class XControlModel; } @@ -389,7 +389,7 @@ protected: bool mbAwtModel; ///< True = AWT control model, false = form component. }; -typedef ::boost::shared_ptr< ControlModelBase > ControlModelRef; +typedef std::shared_ptr< ControlModelBase > ControlModelRef; @@ -972,7 +972,7 @@ private: template< typename ModelType > inline ModelType& EmbeddedControl::createModel() { - ::boost::shared_ptr< ModelType > xModel( new ModelType ); + std::shared_ptr< ModelType > xModel( new ModelType ); mxModel = xModel; xModel->setFormComponentMode(); return *xModel; @@ -981,7 +981,7 @@ inline ModelType& EmbeddedControl::createModel() template< typename ModelType, typename ParamType > inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) { - ::boost::shared_ptr< ModelType > xModel( new ModelType( rParam ) ); + std::shared_ptr< ModelType > xModel( new ModelType( rParam ) ); mxModel = xModel; xModel->setFormComponentMode(); return *xModel; diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 01612bdbd332..dfc4d0a6f53a 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -92,7 +92,7 @@ protected: sal_uInt16 mnGroupId; ///< Group identifier for grouped controls. }; -typedef ::boost::shared_ptr< VbaSiteModel > VbaSiteModelRef; +typedef std::shared_ptr< VbaSiteModel > VbaSiteModelRef; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index ff2bf71d871e..f258bb081161 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -102,7 +102,7 @@ private: OUString maMacroName; }; -typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; +typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index 6f1438c88e50..2b27736b6dc4 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -22,7 +22,7 @@ #define INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX #include <list> -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/array.hpp> #include <rtl/ustring.hxx> @@ -84,11 +84,11 @@ namespace oox { namespace ppt { ShapeTargetElement maShapeTarget; }; - typedef boost::shared_ptr< AnimTargetElement > AnimTargetElementPtr; + typedef std::shared_ptr< AnimTargetElement > AnimTargetElementPtr; struct AnimationCondition; - typedef ::std::list< AnimationCondition > AnimationConditionList; + typedef std::list< AnimationCondition > AnimationConditionList; /** data for CT_TLTimeCondition */ struct AnimationCondition diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 8ec789eaab9f..02f0f4b328df 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -82,7 +82,7 @@ private: std::vector< SlidePersistPtr > maMasterPages; std::vector< SlidePersistPtr > maNotesPages; - ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; + std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; }; } } diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 4bed15ed7bec..db4f7e605b7e 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -102,7 +102,7 @@ public: oox::drawingml::ShapePtr getShapes() { return maShapesPtr; } void hideShapesAsMasterShapes(); - ::std::list< boost::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } + ::std::list< std::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } oox::ppt::HeaderFooter& getHeaderFooter(){ return maHeaderFooter; }; oox::vml::Drawing* getDrawing() { return mpDrawingPtr.get(); } @@ -121,7 +121,7 @@ public: private: OUString maPath; OUString maLayoutPath; - ::boost::shared_ptr< oox::vml::Drawing > mpDrawingPtr; + std::shared_ptr< oox::vml::Drawing > mpDrawingPtr; com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage; oox::drawingml::ThemePtr mpThemePtr; // the theme that is used oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any) @@ -131,7 +131,7 @@ private: oox::drawingml::ShapePtr maShapesPtr; oox::drawingml::Color maBackgroundColor; oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr; - ::std::list< boost::shared_ptr< TimeNode > > maTimeNodeList; + ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList; oox::ppt::HeaderFooter maHeaderFooter; sal_Int32 mnLayoutValueToken; diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx index 9c8eda4666b5..9115ab77015b 100644 --- a/include/oox/ppt/timenode.hxx +++ b/include/oox/ppt/timenode.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_OOX_PPT_TIMENODE_HXX #define INCLUDED_OOX_PPT_TIMENODE_HXX -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> #include <list> #include <rtl/ustring.hxx> @@ -38,8 +38,8 @@ namespace oox { namespace ppt { class TimeNode; class SlideTransition; - typedef boost::shared_ptr< TimeNode > TimeNodePtr; - typedef ::std::list< TimeNodePtr > TimeNodePtrList; + typedef std::shared_ptr< TimeNode > TimeNodePtr; + typedef std::list< TimeNodePtr > TimeNodePtrList; class TimeNode { diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index cc8058595cee..4335580ee903 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -88,7 +88,7 @@ public: (Word only) Returns the last shape in the collection, if it is after the last mark from pushMark(), and removes it. */ - boost::shared_ptr< ShapeBase > takeLastShape(); + std::shared_ptr< ShapeBase > takeLastShape(); /** Adds a recursion mark to the stack. It is possible that a shape contains <w:txbxContent> which contains another shape, and writerfilter needs to know which shape is from the inner @@ -126,7 +126,7 @@ private: template< typename ShapeT > ShapeT& ShapeContainer::createShape() { - ::boost::shared_ptr< ShapeT > xShape( new ShapeT( mrDrawing ) ); + std::shared_ptr< ShapeT > xShape( new ShapeT( mrDrawing ) ); maShapes.push_back( xShape ); return *xShape; } |