diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:10:44 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:16:52 +0200 |
commit | 7b1c5b297746e1fbc7d8b728e888478a260c52e4 (patch) | |
tree | f2659b7cd4f12d977b9a5fa0db0e0c1bd3aaa8d8 | |
parent | tdf#89954 sw: let annotation have CH_TXTATR_INWORD placeholder again (diff) | |
download | core-7b1c5b297746e1fbc7d8b728e888478a260c52e4.tar.gz core-7b1c5b297746e1fbc7d8b728e888478a260c52e4.zip |
writerfilter: use std::unique_ptr<> in StyleSheetTable
Change-Id: I38eebe098c87cceb69b9ff4c48e18d3434ad1557
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.hxx | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 826172b738c0..cdc0e59f38ce 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -390,7 +390,6 @@ StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper, StyleSheetTable::~StyleSheetTable() { - delete m_pImpl; } PropertyMapPtr StyleSheetTable::GetDefaultCharProps() diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 44d33ea95e6e..ba056309a8fc 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_STYLESHEETTABLE_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_STYLESHEETTABLE_HXX +#include <memory> #include "TblStylePrHandler.hxx" #include <DomainMapper.hxx> @@ -77,7 +78,7 @@ public: }; typedef std::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr; -typedef ::std::deque<StyleSheetEntryPtr> StyleSheetEntryDeque; +typedef std::deque<StyleSheetEntryPtr> StyleSheetEntryDeque; typedef std::shared_ptr<StyleSheetEntryDeque> StyleSheetEntryDequePtr; class DomainMapper; @@ -85,7 +86,7 @@ class StyleSheetTable : public LoggedProperties, public LoggedTable { - StyleSheetTable_Impl *m_pImpl; + std::unique_ptr<StyleSheetTable_Impl> m_pImpl; public: StyleSheetTable(DomainMapper& rDMapper, css::uno::Reference<css::text::XTextDocument> const& xTextDocument, bool bIsNewDoc); |