diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-17 09:52:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-17 10:59:48 +0200 |
commit | 5fc51f8d254da21d5ed2d3fb9293020bbfbfab92 (patch) | |
tree | b96268f95e87e0e342275b2cd0f87fd6d090c4ec /include/ucbhelper | |
parent | edc264d1da7d4240c27c9f98efab09e84d78fff3 (diff) |
use unique_ptr for pImpl in ucbhelper/
Change-Id: Ibae75fc4d843bd38179d4c7afc6ddb532835c7a6
Diffstat (limited to 'include/ucbhelper')
-rw-r--r-- | include/ucbhelper/commandenvironment.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/contenthelper.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/contentidentifier.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 5 | ||||
-rw-r--r-- | include/ucbhelper/providerhelper.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/resultset.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/resultsetmetadata.hxx | 3 |
7 files changed, 15 insertions, 8 deletions
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index 11bc5e3e4a89..5bd8ee6451bb 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/ucbhelperdllapi.h> #include <cppuhelper/implbase1.hxx> +#include <memory> namespace ucbhelper { @@ -36,7 +37,7 @@ struct CommandEnvironment_Impl; class UCBHELPER_DLLPUBLIC CommandEnvironment : public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment > { - CommandEnvironment_Impl* m_pImpl; + std::unique_ptr<CommandEnvironment_Impl> m_pImpl; private: CommandEnvironment( const CommandEnvironment& ) = delete; diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 20b15c71f8aa..91cf9934ae94 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -38,6 +38,7 @@ #include <rtl/ref.hxx> #include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> +#include <memory> namespace com { namespace sun { namespace star { namespace ucb { struct CommandInfo; @@ -96,7 +97,7 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper : friend class PropertySetInfo; friend class CommandProcessorInfo; - ucbhelper_impl::ContentImplHelper_Impl* m_pImpl; + std::unique_ptr<ucbhelper_impl::ContentImplHelper_Impl> m_pImpl; protected: osl::Mutex m_aMutex; diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 29ff8676db7e..702febc060ee 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/ucb/XContentIdentifier.hpp> #include <ucbhelper/ucbhelperdllapi.h> +#include <memory> namespace ucbhelper @@ -74,7 +75,7 @@ public: throw( css::uno::RuntimeException, std::exception ) override; private: - ContentIdentifier_Impl* m_pImpl; + std::unique_ptr<ContentIdentifier_Impl> m_pImpl; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 3361ccb04274..03122c18742f 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -32,6 +32,7 @@ #include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/ucbhelperdllapi.h> +#include <memory> namespace ucbhelper { @@ -63,7 +64,7 @@ class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject, public css::lang::XTypeProvider, public css::task::XInteractionRequest { - InteractionRequest_Impl * m_pImpl; + std::unique_ptr<InteractionRequest_Impl> m_pImpl; protected: void setRequest( const css::uno::Any & rRequest ); @@ -151,7 +152,7 @@ struct InteractionContinuation_Impl; */ class UCBHELPER_DLLPUBLIC InteractionContinuation : public cppu::OWeakObject { - InteractionContinuation_Impl * m_pImpl; + std::unique_ptr<InteractionContinuation_Impl> m_pImpl; protected: /** diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index 91c76f140560..0941e085f530 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -21,6 +21,7 @@ #define INCLUDED_UCBHELPER_PROVIDERHELPER_HXX #include <list> +#include <memory> #include <com/sun/star/ucb/XContentProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -70,7 +71,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject, { friend class ContentImplHelper; - ucbhelper_impl::ContentProviderImplHelper_Impl* m_pImpl; + std::unique_ptr<ucbhelper_impl::ContentProviderImplHelper_Impl> m_pImpl; protected: osl::Mutex m_aMutex; diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 2acd65d1c24b..63dec4212149 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -37,6 +37,7 @@ #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> +#include <memory> namespace ucbhelper { @@ -70,7 +71,7 @@ class UCBHELPER_DLLPUBLIC ResultSet : public css::sdbc::XCloseable, public css::beans::XPropertySet { - ResultSet_Impl* m_pImpl; + std::unique_ptr<ResultSet_Impl> m_pImpl; public: /** diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 730bdf1a5ab9..cda709eb045e 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -21,6 +21,7 @@ #define INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX #include <vector> +#include <memory> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -141,7 +142,7 @@ class UCBHELPER_DLLPUBLIC ResultSetMetaData : public css::sdbc::XResultSetMetaData { private: - ucbhelper_impl::ResultSetMetaData_Impl* m_pImpl; + std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl; protected: css::uno::Reference< css::uno::XComponentContext > m_xContext; |