diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac /include/filter | |
parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 16 | ||||
-rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 19 |
3 files changed, 18 insertions, 21 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 93f8d35d52fd..884829b3a97e 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1155,9 +1155,7 @@ private: bool mbPicStrmQueried; /// True = ImplQueryPictureStream() has been called. }; -typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef; - - +typedef std::shared_ptr< EscherExGlobal > EscherExGlobalRef; class SdrObject; class SdrPage; diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index a6fdf663c0d4..b6b6bd7dd011 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -23,10 +23,10 @@ #include <string.h> #include <map> -#include <vector> +#include <memory> #include <set> +#include <vector> -#include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_set.hpp> @@ -114,19 +114,19 @@ typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders; struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById { - bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; + bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; }; struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoByTxBxComp { - bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; + bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; }; // the following will be sorted explicitly: -typedef ::std::set< ::boost::shared_ptr<SvxMSDffShapeInfo>, +typedef ::std::set< std::shared_ptr<SvxMSDffShapeInfo>, CompareSvxMSDffShapeInfoById > SvxMSDffShapeInfos_ById; -typedef ::std::multiset< ::boost::shared_ptr<SvxMSDffShapeInfo>, +typedef ::std::multiset< std::shared_ptr<SvxMSDffShapeInfo>, CompareSvxMSDffShapeInfoByTxBxComp> SvxMSDffShapeInfos_ByTxBxComp; #define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 2ad8338e9932..2705df3bc343 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -13,7 +13,6 @@ #include <ostream> #include <memory> #include <vector> -#include <boost/shared_ptr.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -173,7 +172,7 @@ public: class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase { sal_Int32 tbid; - boost::shared_ptr< WString > name; //exist only if tbid equals 0x00000001 + std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001 public: TBCMenuSpecific(); virtual ~TBCMenuSpecific(){} @@ -205,7 +204,7 @@ public: class TBCComboDropdownSpecific : public TBBase { - boost::shared_ptr< TBCCDData > data; + std::shared_ptr< TBCCDData > data; public: TBCComboDropdownSpecific( const TBCHeader& header ); TBCComboDropdownSpecific(){} @@ -218,10 +217,10 @@ public: class TBCBSpecific : public TBBase { sal_uInt8 bFlags; - boost::shared_ptr< TBCBitMap > icon; // optional - boost::shared_ptr< TBCBitMap > iconMask; // optional - boost::shared_ptr< sal_uInt16 > iBtnFace; // optional - boost::shared_ptr< WString > wstrAcc; // optional + std::shared_ptr< TBCBitMap > icon; // optional + std::shared_ptr< TBCBitMap > iconMask; // optional + std::shared_ptr< sal_uInt16 > iBtnFace; // optional + std::shared_ptr< WString > wstrAcc; // optional public: TBCBSpecific(); @@ -266,8 +265,8 @@ class MSFILTER_DLLPUBLIC TBCHeader : public TBBase sal_uInt16 tcid; sal_uInt32 tbct; sal_uInt8 bPriority; - boost::shared_ptr< sal_uInt16 > width; //optional - boost::shared_ptr< sal_uInt16 > height; //optional + std::shared_ptr< sal_uInt16 > width; //optional + std::shared_ptr< sal_uInt16 > height; //optional public: TBCHeader(); @@ -287,7 +286,7 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase { TBCHeader rHeader; TBCGeneralInfo controlGeneralInfo; - boost::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct + std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct TBCData(const TBCData&) SAL_DELETED_FUNCTION; TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION; public: |