diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:30:13 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 14:12:07 +0100 |
commit | ddc280920282ff3e2801e9a79f9dfa8a6c6f5699 (patch) | |
tree | 4b477c76374f2f36659ba674c2e5d6796629d45b /sw/inc/fmtmeta.hxx | |
parent | 63e7b7afa75252298606c84e8ec82adaee5fa28a (diff) |
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
Diffstat (limited to 'sw/inc/fmtmeta.hxx')
-rw-r--r-- | sw/inc/fmtmeta.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index ac4747a7b5ff..1ce349367e5c 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -26,9 +26,8 @@ #include <sfx2/Metadatable.hxx> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> +#include <memory> #include <vector> namespace com { namespace sun { namespace star { @@ -91,7 +90,7 @@ private: friend class SwTextMeta; ///< needs SetTextAttr, DoCopy friend class ::sw::Meta; ///< needs m_pTextAttr - ::boost::shared_ptr< ::sw::Meta > m_pMeta; + std::shared_ptr< ::sw::Meta > m_pMeta; SwTextMeta * m_pTextAttr; SwTextMeta * GetTextAttr() { return m_pTextAttr; } @@ -105,7 +104,7 @@ private: public: /// takes ownership - explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta, + explicit SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta, const sal_uInt16 i_nWhich ); virtual ~SwFormatMeta(); @@ -198,12 +197,12 @@ class MetaFieldManager : private ::boost::noncopyable { private: - typedef ::std::vector< ::boost::weak_ptr<MetaField> > MetaFieldList_t; + typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t; MetaFieldList_t m_MetaFields; public: MetaFieldManager(); - ::boost::shared_ptr<MetaField> makeMetaField( + std::shared_ptr<MetaField> makeMetaField( SwFormatMeta * const i_pFormat = 0, const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); |