bnc#818997 RTF import: don't ignore page breaks between shapes

Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
(cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9)

2 files changed, 85 insertions, 0 deletions

diff --git a/sw/qa/extras/rtfimport/data/n818997.rtf b/sw/qa/extras/rtfimport/data/n818997.rtf
new file mode 100644
index 000000000000..2ce44048626a
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n818997.rtf
@@ -0,0 +1,77 @@
+{\rtf 

+{\shp 

+{\*\shpinst\shpleft2310\shpright6060\shptop8685\shpbottom8985\shpbxpage

+\shpbypage\shpwr3\shpz2 

+{\sp 

+{\sn shapeType}

+{\sv 202}

+}

+{\sp 

+{\sn dxTextLeft}

+{\sv 

+0}

+}

+{\sp 

+{\sn dxTextRight}

+{\sv 0}

+}

+{\sp 

+{\sn dyTextTop}

+{\sv 0}

+}

+{\sp 

+{\sn 

+dyTextBottom}

+{\sv 0}

+}

+{\sp 

+{\sn fLine}

+{\sv 0}

+}

+{\shptxt\plain\pard\f29\fs24 

+On first page.\par}

+{\sp 

+{\sn fFilled}

+{\sv 0}

+}

+}

+}

+\page

+{\shp 

+{\*\shpinst\shpleft4800\shpright8025\shptop780\shpbottom1080\shpbxpage

+\shpbypage\shpwr3\shpz2 

+{\sp 

+{\sn shapeType}

+{\sv 202}

+}

+{\sp 

+{\sn dxTextLeft}

+{\sv 

+0}

+}

+{\sp 

+{\sn dxTextRight}

+{\sv 0}

+}

+{\sp 

+{\sn dyTextTop}

+{\sv 0}

+}

+{\sp 

+{\sn 

+dyTextBottom}

+{\sv 0}

+}

+{\sp 

+{\sn fLine}

+{\sv 0}

+}

+{\shptxt\plain\pard\f29\fs24\b 

+On second page.\par}

+{\sp 

+{\sn fFilled}

+{\sv 0}

+}

+}

+}

+}

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index d2ccfbae100a..c0ceabc989fc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -135,6 +135,7 @@ public:
     void testFdo63023();
     void testFdo42109();
     void testFdo62977();
+    void testN818997();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -259,6 +260,7 @@ void Test::run()
         {"fdo63023.rtf", &Test::testFdo63023},
         {"fdo42109.rtf", &Test::testFdo42109},
         {"fdo62977.rtf", &Test::testFdo62977},
+        {"n818997.rtf", &Test::testN818997},
     };
     header();
     for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1232,6 +1234,12 @@ void Test::testFdo62977()
     getRun(getParagraph(1), 1, OUString("\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88", 9, RTL_TEXTENCODING_UTF8));
 }
 
+void Test::testN818997()
+{
+    // \page was ignored between two \shp tokens.
+    CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();