diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /include/oox | |
parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/core/filterbase.hxx | 4 | ||||
-rw-r--r-- | include/oox/core/xmlfilterbase.hxx | 2 | ||||
-rw-r--r-- | include/oox/crypto/DocumentDecryption.hxx | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 5e91f600469c..3d10c08fbae6 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -36,8 +36,6 @@ #include <oox/helper/storagebase.hxx> #include <oox/dllapi.h> -#include <boost/scoped_ptr.hpp> - namespace com { namespace sun { namespace star { namespace awt { struct DeviceInfo; } namespace frame { class XFrame; } @@ -284,7 +282,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const = 0; private: - boost::scoped_ptr< FilterBaseImpl > mxImpl; + std::unique_ptr< FilterBaseImpl > mxImpl; }; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index a8c950e3ed59..b6bc9687b198 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -52,7 +52,7 @@ namespace oox { namespace sax_fastparser { class FastSerializerHelper; - typedef boost::shared_ptr< FastSerializerHelper > FSHelperPtr; + typedef std::shared_ptr< FastSerializerHelper > FSHelperPtr; } namespace oox { diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index 1f2d3bc5bc25..b9bf2d449260 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -25,7 +25,7 @@ #include <oox/crypto/AgileEngine.hxx> #include <oox/crypto/Standard2007Engine.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vector> namespace oox { @@ -44,7 +44,7 @@ private: }; oox::ole::OleStorage& mrOleStorage; - boost::scoped_ptr<CryptoEngine> mEngine; + std::unique_ptr<CryptoEngine> mEngine; CryptoType mCryptoType; bool readAgileEncryptionInfo( com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rStream ); |