diff options
65 files changed, 262 insertions, 262 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; } 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; } } diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index 2281d0423041..ea6f7a0647c5 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -48,7 +48,7 @@ TableBackgroundStyleContext::onCreateContext( ::sal_Int32 aElementToken, const A // EG_ThemeableFillStyle (choice) case A_TOKEN( fill ): // CT_FillProperties { - boost::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties(); + std::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties(); rxFillProperties.reset( new FillProperties ); return new FillPropertiesContext( *this, *rxFillProperties ); } diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 45486fd16377..2d8dfb8ad7b7 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -365,7 +365,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo Color aBgColor; sal_Int32 nPhClr = API_RGB_TRANSPARENT; - boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() ); + std::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() ); ::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( rTable.getBackgroundFillStyleRef() ); if (rBackgroundFillPropertiesPtr.get()) aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor(); diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 404bd9f5d07c..8ff5972183b7 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1359,7 +1359,7 @@ void SharedConfigData::createShortList( const OUString& rData ) sal_Int64 nStartKey; if( StringHelper::convertStringToInt( nStartKey, aDataVec[ 1 ] ) ) { - ::boost::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] ); + std::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] ); if( xList.get() ) { aDataVec.erase( aDataVec.begin(), aDataVec.begin() + 2 ); @@ -1382,7 +1382,7 @@ void SharedConfigData::createUnitConverter( const OUString& rData ) double fFactor; if( StringHelper::convertStringToDouble( fFactor, aFactor ) && (fFactor != 0.0) ) { - ::boost::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] ); + std::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] ); if( xList.get() ) { xList->setFactor( bRecip ? (1.0 / fFactor) : fFactor ); diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index b59094f916f0..82bc27d9606f 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -419,7 +419,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla BinaryXInputStream aXStrm( rStrg.openInputStream( "x" ), true ); pMultiPage->importPageAndMultiPageProperties( aXStrm, maControls.size() ); } - typedef std::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap; + typedef std::unordered_map< sal_uInt32, std::shared_ptr< VbaFormControl > > IdToPageMap; IdToPageMap idToPage; VbaFormControlVector::iterator it = maControls.begin(); VbaFormControlVector::iterator it_end = maControls.end(); diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index aed94381a41b..e4910ad037d0 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -28,8 +28,8 @@ #include "oox/vml/vmldrawingfragment.hxx" #include "oox/vml/vmlshape.hxx" #include "oox/drawingml/themefragmenthandler.hxx" -#include <boost/scoped_ptr.hpp> #include <cppuhelper/supportsservice.hxx> +#include <memory> namespace oox { namespace shape { @@ -105,7 +105,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape { case XML_chart: { - boost::scoped_ptr<ContextHandler2Helper> pFragmentHandler( + std::unique_ptr<ContextHandler2Helper> pFragmentHandler( new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" )); mxChartShapeContext.set(new ChartGraphicDataContext(*pFragmentHandler, mpShape, true)); @@ -170,7 +170,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) { if (! mxGraphicShapeContext.is()) { - boost::shared_ptr<ContextHandler2Helper> pFragmentHandler + std::shared_ptr<ContextHandler2Helper> pFragmentHandler (new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); ShapePtr pMasterShape; @@ -226,7 +226,7 @@ ShapeContextHandler::getDiagramShapeContext() { if (!mxDiagramShapeContext.is()) { - boost::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); + std::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); mpShape.reset(new Shape()); mxDiagramShapeContext.set(new DiagramGraphicDataContext(*pFragmentHandler, mpShape)); } @@ -428,7 +428,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) if ( getContextHandler() == getDrawingShapeContext() ) { mpDrawing->finalizeFragmentImport(); - if( boost::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() ) + if( std::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() ) xResult = pShape->convertAndInsert( xShapes ); // Only now remove the recursion mark, because getShape() is called in writerfilter // after endFastElement(). diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index 3b40e56c4d2e..a7fbb785ab20 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -61,7 +61,7 @@ ShapeContainer::~ShapeContainer() ShapeType& ShapeContainer::createShapeType() { - ::boost::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) ); + std::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) ); maTypes.push_back( xShape ); return *xShape; } @@ -103,13 +103,13 @@ const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId, bool bD return 0; } -boost::shared_ptr< ShapeBase > ShapeContainer::takeLastShape() +std::shared_ptr< ShapeBase > ShapeContainer::takeLastShape() { OSL_ENSURE( mrDrawing.getType() == VMLDRAWING_WORD, "ShapeContainer::takeLastShape - illegal call, Word filter only" ); assert( !markStack.empty()); if( markStack.top() >= maShapes.size()) - return boost::shared_ptr< ShapeBase >(); - boost::shared_ptr< ShapeBase > ret = maShapes.back(); + return std::shared_ptr< ShapeBase >(); + std::shared_ptr< ShapeBase > ret = maShapes.back(); maShapes.pop_back(); return ret; } 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; |