diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-10 08:59:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-09 10:01:02 +0000 |
| commit | 23498672666312dcda769567f818853ce7810a2e (patch) | |
| tree | 2c7030a57bfcba5ad3c9091f1b359cd5f3d40d50 /sw | |
| parent | 6f718d779a99e86dc43444338d48c89cf64e7f9e (diff) | |
tdf#87034 RTF import: fix multiple superscripts after footnote ...
... in the same paragraph. The intention was to avoid replaying the
supertext buffer and using its contents as a custom footnote mark at the
same time. However, it's enough to check if the buffer is empty to do
so, and that avoids the mis-import of the bugdoc as well.
Change-Id: I1e3b0c7f0c6d8eb8250d8b1d0d7d196039c40e79
(cherry picked from commit 93faf178195ca974747849879266783884ae27c5)
Reviewed-on: https://gerrit.libreoffice.org/22815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/tdf87034.rtf | 13 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 7 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf87034.rtf b/sw/qa/extras/rtfimport/data/tdf87034.rtf new file mode 100644 index 000000000000..16f322c6ff28 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf87034.rtf @@ -0,0 +1,13 @@ +{\rtf1 +\pard\plain A +{\chftn +{\footnote\chftn F +} +} +B +{\super 3} +C +{\super 4} +D +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 565d5353ad16..e95ada6f7b33 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2473,6 +2473,13 @@ DECLARE_RTFIMPORT_TEST(testTdf96308Tabpos, "tdf96308-tabpos.rtf") CPPUNIT_ASSERT(!aTabStops.hasElements()); } +DECLARE_RTFIMPORT_TEST(testTdf87034, "tdf87034.rtf") +{ + // This was A1BC34D, i.e. the first "super" text portion was mis-imported, + // and was inserted instead right before the second "super" text portion. + CPPUNIT_ASSERT_EQUAL(OUString("A1B3C4D"), getParagraph(1)->getString()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |