summaryrefslogtreecommitdiff
path: root/sw/qa/extras/rtfimport
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-02-05 20:46:19 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-05 21:05:45 +0100
commitc4696e7c0456df8d9466acbae3ea1fa9dcfa73f0 (patch)
tree972cfa73c2830443ee280842433674abc9b9bd94 /sw/qa/extras/rtfimport
parentcf8f6fe1f9d65eedbc6f4d65ce0fa88831830966 (diff)
RTF import: fix import of \line symbol
"Required line break" was eaten by the newly added code in text() to ignore \'0a. (regression from f593a2e4179b05ae1019372cde612cb242d1d27f) Change-Id: Id32687c40a17ddb99196635cedfc850182705799
Diffstat (limited to 'sw/qa/extras/rtfimport')
-rw-r--r--sw/qa/extras/rtfimport/data/fdo58646line.rtf1
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx8
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo58646line.rtf b/sw/qa/extras/rtfimport/data/fdo58646line.rtf
new file mode 100644
index 000000000000..63cf71dc6399
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo58646line.rtf
@@ -0,0 +1 @@
+{\rtf1 foo\line bar}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index bf190184fdf3..a3a2f12e651a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -138,6 +138,7 @@ public:
void testFdo58933();
void testFdo44053();
void testFdo48440();
+ void testFdo58646line();
void testFdo58646();
void testFdo59419();
void testFdo58076_2();
@@ -250,6 +251,7 @@ void Test::run()
{"fdo58933.rtf", &Test::testFdo58933},
{"fdo44053.rtf", &Test::testFdo44053},
{"fdo48440.rtf", &Test::testFdo48440},
+ {"fdo58646line.rtf", &Test::testFdo58646line},
{"fdo58646.rtf", &Test::testFdo58646},
{"fdo59419.rtf", &Test::testFdo59419},
{"fdo58076-2.rtf", &Test::testFdo58076_2},
@@ -1076,6 +1078,12 @@ void Test::testFdo48440()
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+void Test::testFdo58646line()
+{
+ // \line symbol was ignored
+ getParagraph(1, "foo\nbar");
+}
+
void Test::testFdo58646()
{
// Page break was ignored inside a continous section, on title page.