[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    4 +---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ddeed05299f842a8dffe2222509459602a57ef79
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Tue Sep 9 10:58:35 2014 +0200

    Use boost::shared_ptr
    
    Change-Id: I488accb1fb7588d6b91a8406d78f5897c12b3548

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9a90ce7..a7a3185 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -207,7 +207,6 @@ DomainMapper_Impl::DomainMapper_Impl(
         m_xInsertTextRange(xInsertTextRange),
         m_bIsNewDoc(bIsNewDoc),
         m_bInTableStyleRunProps(false),
-        m_pSdtHelper(0),
         m_nTableDepth(0),
         m_bHasFtnSep(false),
         m_bIgnoreNextPara(false),
@@ -233,7 +232,7 @@ DomainMapper_Impl::DomainMapper_Impl(
     getTableManager( ).startLevel();
     m_bUsingEnhancedFields = 
officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get(m_xComponentContext);
 
-    m_pSdtHelper = new SdtHelper(*this);
+    m_pSdtHelper.reset(new SdtHelper(*this));
 
     m_aRedlines.push(std::vector<RedlineParamsPtr>());
 }
@@ -245,7 +244,6 @@ DomainMapper_Impl::~DomainMapper_Impl()
     RemoveLastParagraph( );
     getTableManager( ).endLevel();
     popTableManager( );
-    delete m_pSdtHelper;
 }
 
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 4bee8ac..2376f3c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -771,7 +771,7 @@ public:
     /// If we're inside <w:rPr>, inside <w:style w:type="table">
     bool m_bInTableStyleRunProps;
 
-    SdtHelper* m_pSdtHelper;
+    boost::shared_ptr<SdtHelper> m_pSdtHelper;
 
     /// Document background color, applied to every page style.
     boost::optional<sal_Int32> m_oBackgroundColor;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits