diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-17 13:21:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-17 13:21:50 +0200 |
| commit | b5eaa0f9f00cd62f4769c3e8860d788844ccf557 (patch) | |
| tree | 3d939a679a3dc4dc7aea39e22928e720f1ce5106 /sw/source/filter | |
| parent | 048a32d903c8cc81a8836c7c7209b92e0bfd6cd7 (diff) | |
use unique_ptr for pImpl in sw/
Change-Id: I8508894d70e1ff16cfb9d7a9d716f11a923f453d
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlitmap.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlitmpr.cxx | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 5855235764cf..0e213ed4aedd 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -23,6 +23,7 @@ #include <set> #include <map> #include <vector> +#include <memory> #include <swtypes.hxx> #include "wwstyles.hxx" #include <rtl/textenc.h> @@ -180,7 +181,7 @@ namespace sw { private: //I hate these things stupid pImpl things, but its warranted here - ::myImplHelpers::StyleMapperImpl<SwTextFormatColl> *mpImpl; + std::unique_ptr<::myImplHelpers::StyleMapperImpl<SwTextFormatColl> > mpImpl; public: explicit ParaStyleMapper(SwDoc &rDoc); ~ParaStyleMapper(); diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 229a757ebbd0..a070676b5c00 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -460,7 +460,6 @@ namespace sw ParaStyleMapper::~ParaStyleMapper() { - delete mpImpl; } ParaStyleMapper::StyleResult ParaStyleMapper::GetStyle( diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 00c7fcac027d..3fffd7743c9a 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -23,6 +23,7 @@ #include <sal/types.h> #include <tools/ref.hxx> #include <xmloff/xmltoken.hxx> +#include <memory> #define MID_SW_FLAG_MASK 0x0000ffff @@ -58,7 +59,7 @@ class SvXMLItemMapEntries_impl; class SvXMLItemMapEntries : public SvRefBase { protected: - SvXMLItemMapEntries_impl* mpImpl; + std::unique_ptr<SvXMLItemMapEntries_impl> mpImpl; public: explicit SvXMLItemMapEntries(SvXMLItemMapEntry* pEntrys); diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx index cec6e645f8fb..87f3b4da4383 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -32,8 +32,8 @@ public: }; SvXMLItemMapEntries::SvXMLItemMapEntries( SvXMLItemMapEntry* pEntries ) + : mpImpl( new SvXMLItemMapEntries_impl ) { - mpImpl = new SvXMLItemMapEntries_impl; mpImpl->mpEntries = pEntries; mpImpl->mnCount = 0; @@ -46,7 +46,6 @@ SvXMLItemMapEntries::SvXMLItemMapEntries( SvXMLItemMapEntry* pEntries ) SvXMLItemMapEntries::~SvXMLItemMapEntries() { - delete mpImpl; } SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace, |