Kaydet (Commit) e1953f22 authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: clean up remaining boost::scoped_ptr<> usage

Change-Id: I270c91bec75ff96ac77b550e6adef8d03b07f2b5
üst 7b1c5b29
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICIMPORT_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICIMPORT_HXX
#include <queue> #include <queue>
#include <boost/scoped_ptr.hpp> #include <memory>
#include "LoggedResources.hxx" #include "LoggedResources.hxx"
...@@ -64,7 +64,7 @@ enum GraphicImportType ...@@ -64,7 +64,7 @@ enum GraphicImportType
class GraphicImport : public LoggedProperties, public LoggedTable class GraphicImport : public LoggedProperties, public LoggedTable
,public BinaryObj, public LoggedStream ,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::uno::XComponentContext> m_xComponentContext;
css::uno::Reference<css::lang::XMultiServiceFactory> m_xTextFactory; css::uno::Reference<css::lang::XMultiServiceFactory> m_xTextFactory;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <oox/helper/grabbagstack.hxx> #include <oox/helper/grabbagstack.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <boost/optional.hpp> #include <boost/optional.hpp>
namespace writerfilter { namespace writerfilter {
...@@ -34,7 +34,7 @@ class TextEffectsHandler : public LoggedProperties ...@@ -34,7 +34,7 @@ class TextEffectsHandler : public LoggedProperties
private: private:
boost::optional<PropertyIds> maPropertyId; boost::optional<PropertyIds> maPropertyId;
OUString maElementName; OUString maElementName;
boost::scoped_ptr<oox::GrabBagStack> mpGrabBagStack; std::unique_ptr<oox::GrabBagStack> mpGrabBagStack;
void convertElementIdToPropertyId(sal_Int32 aElementId); void convertElementIdToPropertyId(sal_Int32 aElementId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment