diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:15:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:16:52 +0200 |
| commit | e1953f22097d6f895fe27ea21635c37d3cb48f51 (patch) | |
| tree | edb03d6e72583d5adfbe0f77ce3ce67bfef9a468 | |
| parent | 7b1c5b297746e1fbc7d8b728e888478a260c52e4 (diff) | |
writerfilter: clean up remaining boost::scoped_ptr<> usage
Change-Id: I270c91bec75ff96ac77b550e6adef8d03b07f2b5
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.hxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TextEffectsHandler.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 6a10ddbca9fe..736a5801ae60 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -20,7 +20,7 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICIMPORT_HXX #include <queue> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "LoggedResources.hxx" @@ -64,7 +64,7 @@ enum GraphicImportType class GraphicImport : public LoggedProperties, public LoggedTable ,public BinaryObj, public LoggedStream { - boost::scoped_ptr<GraphicImport_Impl> m_pImpl; + std::unique_ptr<GraphicImport_Impl> m_pImpl; css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; css::uno::Reference<css::lang::XMultiServiceFactory> m_xTextFactory; diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index 02bd9a953d0f..cce0872bb283 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -21,7 +21,7 @@ #include <oox/helper/grabbagstack.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <boost/optional.hpp> namespace writerfilter { @@ -34,7 +34,7 @@ class TextEffectsHandler : public LoggedProperties private: boost::optional<PropertyIds> maPropertyId; OUString maElementName; - boost::scoped_ptr<oox::GrabBagStack> mpGrabBagStack; + std::unique_ptr<oox::GrabBagStack> mpGrabBagStack; void convertElementIdToPropertyId(sal_Int32 aElementId); |