Related: tdf#92521 RTF export: handle section break right after a table

Change-Id: Ibb6e612165ec6e5d771bdf9efa13a88a72233d6f

1 files changed, 12 insertions, 1 deletions

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 83219e973ced..3c9c5b508545 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -316,12 +316,12 @@ void RtfAttributeOutput::EmptyParagraph()
 
 void RtfAttributeOutput::SectionBreaks(const SwNode& rNode)
 {
+    SwNodeIndex aNextIndex(rNode, 1);
     if (rNode.IsTextNode())
     {
         OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
 
         // output page/section breaks
-        SwNodeIndex aNextIndex(rNode, 1);
         m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr());
         m_bBufferSectionBreaks = true;
 
@@ -344,6 +344,17 @@ void RtfAttributeOutput::SectionBreaks(const SwNode& rNode)
         }
         m_bBufferSectionBreaks = false;
     }
+    else if (rNode.IsEndNode())
+    {
+        // End of something: make sure that it's the end of a table.
+        assert(rNode.StartOfSectionNode()->IsTableNode());
+        if (aNextIndex.GetNode().IsTextNode())
+        {
+            // Handle section break between a table and a text node following it.
+            const SwTextNode* pTextNode = aNextIndex.GetNode().GetTextNode();
+            m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode);
+        }
+    }
 }
 
 void RtfAttributeOutput::StartParagraphProperties()