diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 10:14:20 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 10:18:21 +0200 |
commit | cc58fe655918e5fba7d75af1a2652e1210e37dc1 (patch) | |
tree | 10a803e22a2a1273729b58c4b2ada96764ef9879 /writerfilter | |
parent | 46e7991be05a39a24e0a559db6ff1aea0ebc14e5 (diff) |
writerfilter: use std::unique_ptr<> in DomainMapperTableManager
Change-Id: Ib5910d3198824d625a96b53a30ad67c69c622642
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 9ecf2754749b..64199398d874 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -66,8 +66,6 @@ DomainMapperTableManager::DomainMapperTableManager() : DomainMapperTableManager::~DomainMapperTableManager() { - if ( m_pTablePropsHandler ) - delete m_pTablePropsHandler, m_pTablePropsHandler = nullptr; } bool DomainMapperTableManager::attribute(Id nName, Value& rValue) diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 0bd2f429e699..14e20b8c12d9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -27,6 +27,7 @@ #include "StyleSheetTable.hxx" #include <com/sun/star/text/XTextRange.hpp> #include <vector> +#include <memory> #include <comphelper/sequenceashashmap.hxx> namespace writerfilter { @@ -72,7 +73,7 @@ class DomainMapperTableManager : public TableManager sal_uInt32 m_nLayoutType; sal_Int32 m_nMaxFixedWidth; - TablePropertiesHandler *m_pTablePropsHandler; + std::unique_ptr<TablePropertiesHandler> m_pTablePropsHandler; PropertyMapPtr m_pStyleProps; virtual void clearData() SAL_OVERRIDE; |