fd0#80997: Fix for text missing which is behind textbox in RT.
Issue:
-If file contains Textbox having "In front of text" wrap property,
then text behind the textbox is missing after roundtrip.
Change-Id: I1b4b7c7ea0e9fd2ae4594b9d5e66246974b09c2a
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80997.docx b/sw/qa/extras/ooxmlexport/data/fdo80997.docx
new file mode 100644
index 0000000..713e890
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/fdo80997.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 922301a..f22b96c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3413,6 +3413,13 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80897 , "fdo80897.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo80997, "fdo80997.docx")
{
// The problem was that the DOCX exporter not able to export text behind textbox, if textbox has a wrap property.
uno::Reference< text::XTextRange > xParagraph = getParagraph( 1 );
uno::Reference< text::XTextRange > xText = getRun( xParagraph, 1, " text");
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 5da52e8..89d90aa 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2325,7 +2325,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
AttrOutput().RunText( aSavedSnippet, eChrSet );
AttrOutput().EndRun();
}
else if( bPostponeWritingText && FLY_NOT_PROCESSED == nStateOfFlyFrame )
else if( bPostponeWritingText && !aSavedSnippet.isEmpty() )
{
//write the postponed text run
bPostponeWritingText = false ;
