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

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |    1 -
 sw/source/filter/ww8/docxattributeoutput.hxx |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 10560949f90e08fe4a04dd91c7d388c4998100e8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 5 09:26:13 2015 +0200

    sw: use std::unique_ptr in docxattributeoutput
    
    Change-Id: Ie551cc9c1de20c017d8cf9f4d6f060729f9c245b

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e480f48..9e2dc5e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8406,7 +8406,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
       m_pFootnotesList( new ::docx::FootnotesList() ),
       m_pEndnotesList( new ::docx::FootnotesList() ),
       m_footnoteEndnoteRefTag( 0 ),
-      m_pSectionInfo( NULL ),
       m_pRedlineData( NULL ),
       m_nRedlineId( 0 ),
       m_bOpenedSectPr( false ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index da5a263..a2e2599 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -35,7 +35,6 @@
 #include <fldbas.hxx>
 
 #include <vector>
-#include <boost/scoped_ptr.hpp>
 #include <boost/optional.hpp>
 #include <oox/export/vmlexport.hxx>
 #include <oox/export/drawingml.hxx>
@@ -742,7 +741,7 @@ private:
     std::unique_ptr<docx::FootnotesList> m_pFootnotesList;
     std::unique_ptr<docx::FootnotesList> m_pEndnotesList;
     int m_footnoteEndnoteRefTag;
-    boost::scoped_ptr< const WW8_SepInfo > m_pSectionInfo;
+    std::unique_ptr< const WW8_SepInfo > m_pSectionInfo;
 
     /// Redline data to remember in the text run.
     const SwRedlineData *m_pRedlineData;
@@ -878,7 +877,7 @@ private:
         OString fontKey;
     };
 
-    boost::scoped_ptr<TableReference> m_tableReference;
+    std::unique_ptr<TableReference> m_tableReference;
 
     std::map< OUString, EmbeddedFontRef > fontFilesMap; // font file url to data