diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-17 15:40:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-18 08:35:35 +0200 |
commit | 21c5ff1287c05e24d5cc2b6100866e6992ff8381 (patch) | |
tree | 556ccbda5428414aa00d5aa1d437f245dc1cec20 | |
parent | use unique_ptr for pImpl in editeng/ (diff) | |
download | core-21c5ff1287c05e24d5cc2b6100866e6992ff8381.tar.gz core-21c5ff1287c05e24d5cc2b6100866e6992ff8381.zip |
use unique_ptr for pImpl in extensions,hwpfilter/
Change-Id: I476ba7ec2ebee8c61bf9bb6ff0309cc40affb275
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 1 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.hxx | 3 | ||||
-rw-r--r-- | hwpfilter/source/attributes.cxx | 9 | ||||
-rw-r--r-- | hwpfilter/source/attributes.hxx | 9 |
4 files changed, 8 insertions, 14 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 616a72decdde..6ede832f8e25 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -219,7 +219,6 @@ namespace abp } ODataSourceContext::~ODataSourceContext() { - delete(m_pImpl); } diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 87d3588134ff..4b0bc51e252c 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> +#include <memory> #include "abptypes.hxx" @@ -45,7 +46,7 @@ namespace abp class ODataSourceContext { private: - ODataSourceContextImpl* m_pImpl; + std::unique_ptr<ODataSourceContextImpl> m_pImpl; public: explicit ODataSourceContext( diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx index 4c91b72fc91d..c3683138f14c 100644 --- a/hwpfilter/source/attributes.cxx +++ b/hwpfilter/source/attributes.cxx @@ -52,10 +52,10 @@ sal_Int16 SAL_CALL AttributeListImpl::getLength() throw (RuntimeException, std:: } -AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) : -cppu::WeakImplHelper<css::xml::sax::XAttributeList>( r ) +AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) + : cppu::WeakImplHelper<css::xml::sax::XAttributeList>( r ), + m_pImpl( new AttributeListImpl_impl ) { - m_pImpl = new AttributeListImpl_impl; *m_pImpl = *(r.m_pImpl); } @@ -125,14 +125,13 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtime AttributeListImpl::AttributeListImpl() + : m_pImpl( new AttributeListImpl_impl ) { - m_pImpl = new AttributeListImpl_impl; } AttributeListImpl::~AttributeListImpl() { - delete m_pImpl; } diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx index c4025044bbea..a23058e66256 100644 --- a/hwpfilter/source/attributes.hxx +++ b/hwpfilter/source/attributes.hxx @@ -23,12 +23,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <cppuhelper/implbase.hxx> - -/*---------------------------------------- -* -* Attributlist implementation -* -*----------------------------------------*/ +#include <memory> using namespace ::cppu; using namespace ::com::sun::star::xml::sax; @@ -57,7 +52,7 @@ public: void clear(); private: - struct AttributeListImpl_impl *m_pImpl; + std::unique_ptr<AttributeListImpl_impl> m_pImpl; }; #endif // INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX |