diff options
author | David Tardon <dtardon@redhat.com> | 2016-09-06 14:09:40 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-09-06 14:38:06 +0200 |
commit | c6383758c7f22071346b25f0d3e45d17d73b5a64 (patch) | |
tree | bb9cb45c7cf8938362b2b359b4bb02915c034bef /include/xmloff/xmlimp.hxx | |
parent | 7571242f793200379bf90f605f21225e03df85fe (diff) |
use std::unique_ptr
Change-Id: I0cc84cc6b18849118a2b7824a8e4b37ca063cd50
Diffstat (limited to 'include/xmloff/xmlimp.hxx')
-rw-r--r-- | include/xmloff/xmlimp.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 4ece8c13e23f..a20ac8bfd172 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -176,13 +176,13 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8< std::unique_ptr<SvXMLImport_Impl> mpImpl; // dummy SvXMLNamespaceMap *mpNamespaceMap; - SvXMLUnitConverter *mpUnitConv; + std::unique_ptr<SvXMLUnitConverter> mpUnitConv; SvXMLImportContexts_Impl maContexts; FastSvXMLImportContexts_Impl maFastContexts; - SvXMLNumFmtHelper *mpNumImport; - ProgressBarHelper *mpProgressBarHelper; - XMLEventImportHelper *mpEventImportHelper; - XMLErrors *mpXMLErrors; + std::unique_ptr<SvXMLNumFmtHelper> mpNumImport; + std::unique_ptr<ProgressBarHelper> mpProgressBarHelper; + std::unique_ptr<XMLEventImportHelper> mpEventImportHelper; + std::unique_ptr<XMLErrors> mpXMLErrors; rtl::Reference<StyleMap> mpStyleMap; OUString msPackageProtocol; @@ -629,10 +629,10 @@ inline css::uno::Reference< css::util::XNumberFormatsSupplier > & SvXMLImport::G inline SvXMLNumFmtHelper* SvXMLImport::GetDataStylesImport() { - if ( mpNumImport == nullptr) + if ( !mpNumImport ) CreateDataStylesImport_(); - return mpNumImport; + return mpNumImport.get(); } |