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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxexport.cxx |    3 +--
 sw/source/filter/ww8/wrtw8nds.cxx   |    4 ++--
 sw/source/filter/ww8/ww8atr.cxx     |    1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 397195cd43249851bb89d0a2ba82ffdf975b7317
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Dec 15 08:33:55 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Dec 17 13:22:25 2018 +0100

    sw filter/ww8 code cleanup
    
    cleanup of various nonsense that I ran across.
    
    Change-Id: Ib0a2f7bbe1096b36df88bf77de0eb90405c9f677
    Reviewed-on: https://gerrit.libreoffice.org/65246
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 96d41d44bafa..0965d01942a9 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -577,8 +577,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
             else
                 nRstLnNum = 0;
 
-            AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) );
-            m_pSections->AppendSection( m_pCurrentPageDesc, pParentFormat, nRstLnNum );
+            AppendSection( m_pCurrentPageDesc, pParentFormat, nRstLnNum );
         }
         else
         {
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index b5b1eccfe2dc..02e946af9a9d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3042,7 +3042,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
         {
             // new Section with no own PageDesc/-Break
             //  -> write follow section break;
-            const SwSectionFormat& rFormat = *rSection.GetFormat();
+            const SwSectionFormat* pFormat = rSection.GetFormat();
             ReplaceCr( msword::PageBreak ); // Indicator for Page/Section-Break
 
             // Get the page in use at the top of this section
@@ -3052,7 +3052,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
             if (!pCurrent)
                 pCurrent = m_pCurrentPageDesc;
 
-            AppendSection( pCurrent, &rFormat, nRstLnNum );
+            AppendSection( pCurrent, pFormat, nRstLnNum );
         }
     }
     if ( TOX_CONTENT_SECTION == rSection.GetType() )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 249ce32a6f99..5120aa5f9094 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -436,7 +436,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                 Converting a page break to section break would cause serious issues while importing
                 the RT files with different first page being set.
             */
-            bNewPageDesc = false;
 
             /*
              * If Table cell is open and page header types are different