From a31fbb53dba76736b37213b98b64937f05929a67 Mon Sep 17 00:00:00 2001
From: Pallavi Jadhav <pallavi.jadhav@synerzip.com>
Date: Thu, 6 Feb 2014 13:58:03 +0530
Subject: [PATCH] fdo#74566:DOCX: Preservation <w:br> tag for Break to Next
 Page

	Issue :
	'Break to Next Page' gets converted to 'Page Break Before'
         in RT.

	XML diffrenece :
	- LO exports <w:br> as <w:pageBreakBefore /> in document.xml
	- The page break is written into wrong paragraph.

	Implementation :
	1] Removed implementation to export <w:pageBreakBefore />.
	2] Added a check to write <w:br> in correct paragraph.
	3] Modified code to handle SectionBreak() even if Text node
       	   has no string.
	   It is required when DOCX contains a PageBreak with footer.
	4] Written Export Unit Test case.

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/7891

Change-Id: I237b9c5fdd3083b441f6e81cd8442f458eccf1a0
---
 sw/qa/extras/ooxmlexport/data/fdo74566.docx  | Bin 0 -> 12675 bytes
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx     |  20 +++++++++++++++++++
 sw/source/filter/ww8/docxattributeoutput.cxx |   5 +----
 sw/source/filter/ww8/wrtww8.hxx              |   2 +-
 sw/source/filter/ww8/ww8atr.cxx              |  17 ++++++++--------
 5 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 sw/qa/extras/ooxmlexport/data/fdo74566.docx

diff --git a/sw/qa/extras/ooxmlexport/data/fdo74566.docx b/sw/qa/extras/ooxmlexport/data/fdo74566.docx
new file mode 100644
index 0000000000000000000000000000000000000000..b197b946a4a8fb53ae629d95ff8a74f2466035a0
GIT binary patch
literal 12675
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
R03d>X;6RpY%JlQE{{swOWIzA_

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 194b7c6d582b..73d3393d8f2d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3641,6 +3641,26 @@ DECLARE_OOXMLEXPORT_TEST(testFooterContainHyperlink,"footer-contain-hyperlink.do
     // Check the value of Target which is http://www.google.com/.
     assertXPath(pXmlRels,"/rels:Relationships/rels:Relationship","Target","http://www.google.com/");
 }
+
+DECLARE_OOXMLEXPORT_TEST(testPageBreak,"fdo74566.docx")
+{
+    /*  Break to next page was written into wrong paragraph as <w:pageBreakBefore />.
+     *  LO was not preserving Page Break as <w:br w:type="page" />.
+     *  Now after fix , LO writes Page Break as the new paragraph and also
+     *  preserves the xml tag <w:br>.
+     */
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+
+    uno::Reference<text::XTextRange> xParagraph2 = getParagraph(2);
+    uno::Reference<text::XTextRange> xParagraph4 = getParagraph(4);
+
+    getRun(xParagraph2, 1, "First Page Second Line");
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:br","type","page");
+    getRun(xParagraph4, 1, "Second Page First line after Page Break");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b27aadc8c433..46258f94593e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -399,10 +399,7 @@ void DocxAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
     if ( aNextIndex.GetNode().IsTxtNode() )
     {
         const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( &aNextIndex.GetNode() );
-        // If next node has no string - it is an empty node, so no need to output the section break
-
-        if (!pTxtNode->GetTxt().isEmpty())
-            m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode, m_tableReference->m_bTableCellOpen );
+        m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode, m_tableReference->m_bTableCellOpen, pTxtNode->GetTxt().isEmpty() );
     }
     else if ( aNextIndex.GetNode().IsTableNode() )
     {
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 755e36e5217f..fb63531bb2ee 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -699,7 +699,7 @@ public:
     sal_uLong GetSectionLineNo( const SfxItemSet* pSet, const SwNode& rNd ) const;
 
     /// Start new section.
-    void OutputSectionBreaks( const SfxItemSet *pSet, const SwNode& rNd, bool isCellOpen = false);
+    void OutputSectionBreaks( const SfxItemSet *pSet, const SwNode& rNd, bool isCellOpen = false, bool isTextNodeEmpty = false);
 
     /// Write section properties.
     ///
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7f5f64e0359b..7178b96cd16d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -398,7 +398,7 @@ bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd)
 // Es duerfen nur Funktionen gerufen werden, die nicht in den
 // Ausgabebereich pO schreiben, da dieser nur einmal fuer CHP und PAP existiert
 // und damit im falschen landen wuerden.
-void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode& rNd, bool isCellOpen)
+void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode& rNd, bool isCellOpen, bool isTextNodeEmpty)
 {
     if ( bStyDef || bOutKF || bInWriteEscher || bOutPageDescs )
         return;
@@ -419,9 +419,11 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     // Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types.
     if (pAktPageDesc != pPageDesc)
     {
-        if (isCellOpen && (pAktPageDesc->GetName() != pPageDesc->GetName()))
+        if ( (isCellOpen && (pAktPageDesc->GetName() != pPageDesc->GetName())) || isTextNodeEmpty )
         {
-           // Table cell is open and page header types are different,so do not output section break.
+           // Table cell is open and page header types are different,so do not output section break OR
+           // PageBreak is present but text node has no string - it is an empty node, do not prepare
+           // new page descriptor i.e. bNewPageDesc should be false.
         }
         else
         {
@@ -486,6 +488,8 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                     {
                         bNewPageDesc |= SetAktPageDescFromNode( rNd );
                     }
+                    if( isTextNodeEmpty )
+                       bNewPageDesc = false;
                 }
                 if ( !bNewPageDesc )
                     AttrOutput().OutputItem( *pItem );
@@ -3643,10 +3647,6 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
                 // From now on(fix for #i77900#) we prefer to save a page break as
                 // paragraph attribute, this has to be done after the export of the
                 // paragraph ( => !GetExport().bBreakBefore )
-                if ( !GetExport().bBreakBefore )
-                    PageBreakBefore( true );
-                break;
-
             case SVX_BREAK_PAGE_AFTER:
             case SVX_BREAK_PAGE_BOTH:
                 nC = msword::PageBreak;
@@ -3663,7 +3663,8 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
                 break;
         }
 
-        if ( ( bBefore == GetExport().bBreakBefore ) && nC )
+        if ( (( bBefore != GetExport().bBreakBefore ) && ( nC == msword::PageBreak)) ||
+             (( bBefore == GetExport().bBreakBefore ) && ( nC == msword::ColumnBreak)) )
         {
             // #i76300#
             bool bFollowPageDescWritten = false;