fdo#39001 RTF import: fix fake empty page at the end of the doc

In case we have a \sect, there was no \sbknone (so it counts as a page
break as well) and there is nothing after it, we should not make extra
efforts to make that have some effect, but adding at least one empty
paragraph to that new page.

Change-Id: Ibcbecabcb590ed34ef96a97698e4ab8f638d3483

2 files changed, 30 insertions, 0 deletions

diff --git a/sw/qa/extras/rtfimport/data/fdo39001.rtf b/sw/qa/extras/rtfimport/data/fdo39001.rtf
new file mode 100644
index 000000000000..939b21dcbe13
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo39001.rtf
@@ -0,0 +1,22 @@
+{\rtf1 \ansi 
+{\*\generator Apache XML Graphics RTF Library;}
+\fet0 \ftnbj \paperw11905 \paperh16837 \margt2267 \margb1133 \margl1417 \margr1417 \headery2267 \footery1984 \itap0 
+\sectd 
+{\li0 \f3 \b0 \ql \ri0 \fs24 \cf1 \i0 
+{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 
+FIRST PAGE
+\par 
+}
+}\sect \sbkpage 
+{\li0 \f3 \b0 \ql \ri0 \fs24 \cf1 \i0 
+{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 
+NEXT PAGE
+\par 
+}
+}
+{\li0 \f3 \sbkpage \b0 \ql \sect \ri0 \fs24 \cf1 \i0 
+{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 
+LAST PAGE
+\par 
+}
+}\sect }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 6b628c347038..b22e72904049 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -150,6 +150,7 @@ public:
     void testFdo66040();
     void testN823675();
     void testFdo47802();
+    void testFdo39001();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -285,6 +286,7 @@ void Test::run()
         {"fdo66040.rtf", &Test::testFdo66040},
         {"n823675.rtf", &Test::testN823675},
         {"fdo47802.rtf", &Test::testFdo47802},
+        {"fdo39001.rtf", &Test::testFdo39001},
     };
     header();
     for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1387,6 +1389,12 @@ void Test::testFdo47802()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount());
 }
 
+void Test::testFdo39001()
+{
+    // Document was of 4 pages, \sect at the end of the doc wasn't ignored.
+    CPPUNIT_ASSERT_EQUAL(3, getPages());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();