diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-27 21:28:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-27 22:34:17 +0200 |
| commit | 8100100298b877765e1781fb0eed285e82749ad1 (patch) | |
| tree | 4ccb66e4832f4e7083a1ce1fee15ff066849c29a /sw/qa/extras/rtfexport | |
| parent | 085424074d9aa250d03b66110302e061c4d4f07f (diff) | |
fdo#80167 RTF export: don't loose page breaks
DOCX export tries to write accurately both <w:br> and
<w:pageBreakBefore>, while DOC/RTF prefers just the page break before
paragraph attribute. Given that these later two exporters are not
adapted to write their equivalent of <w:br> at all, add a virtual method
to determine if writing page breaks as "page break before" is preferred
or not, that'll give the expected RTF export result.
This conditionally reverts commit
a31fbb53dba76736b37213b98b64937f05929a67 (fdo#74566:DOCX: Preservation
<w:br> tag for Break to Next Page, 2014-02-06).
Change-Id: I4a5dd295b07739a570cd8cc6709561e64d031273
Diffstat (limited to 'sw/qa/extras/rtfexport')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/fdo80167.rtf | 6 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/fdo80167.rtf b/sw/qa/extras/rtfexport/data/fdo80167.rtf new file mode 100644 index 000000000000..3aa9dd3b6b6a --- /dev/null +++ b/sw/qa/extras/rtfexport/data/fdo80167.rtf @@ -0,0 +1,6 @@ +{\rtf1 +\pard\plain +one\par +\pard\page\par +\pard two\par +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 1fe8c88114e9..cdbb06d4af50 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -653,6 +653,12 @@ DECLARE_RTFEXPORT_TEST(testFdo79599, "fdo79599.rtf") CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x800080), getProperty<sal_uInt32>(xRun, "CharBackColor")); } +DECLARE_RTFEXPORT_TEST(testFdo80167, "fdo80167.rtf") +{ + // Problem was that after export, the page break was missing, so this was 1. + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |