diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-19 09:08:46 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-19 09:52:10 +0200 |
| commit | e9f0d8d02885eca619552b19eab30c1eade9e7ef (patch) | |
| tree | 298f84f3405df32a9c6df85455c14c84e95791de /sw/qa/extras/rtfimport | |
| parent | 13bf3cb1299ebb7f0aa30e9d91e8eea2a67cee74 (diff) | |
tdf#107116 RTF import: fix missing upper and lower borders around text
See commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305:
writerfilter RTF import: override style properties like Word,
2014-06-17) for the context.
Here the problem was that various details of the top border were removed
during the style deduplication, but not the top border sprm itself. That
was interpreted (correctly) by dmapper as "no border", rather than
"inherit from style".
Change-Id: I3dec8df789fc7b75fccfff91ce66f457fecd2f6e
Reviewed-on: https://gerrit.libreoffice.org/36661
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/qa/extras/rtfimport')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/tdf107116.rtf | 10 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf107116.rtf b/sw/qa/extras/rtfimport/data/tdf107116.rtf new file mode 100644 index 000000000000..17c2f5b61a59 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf107116.rtf @@ -0,0 +1,10 @@ +{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033 +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0; +\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;} +{\stylesheet +{\s15\brdrt\brdrs\brdrw15\brsp120\brdrcf15 \brdrb\brdrs\brdrw15\brsp120\brdrcf15 \snext15 style;} +} +\pard\plain before\par +\pard\plain \s15\brdrt\brdrs\brdrw15\brsp120\brdrcf15 \brdrb\brdrs\brdrw15\brsp120\brdrcf15 border \par +\pard\plain after\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 72f7e04d2e6e..2cfaa282ab2b 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2811,6 +2811,12 @@ DECLARE_RTFIMPORT_TEST(testTdf106694, "tdf106694.rtf") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(14605), aTabs[0].Position); } +DECLARE_RTFIMPORT_TEST(testTdf107116, "tdf107116.rtf") +{ + // This was 0, upper border around text (and its distance) was missing. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(convertTwipToMm100(120)), getProperty<sal_Int32>(getParagraph(2), "TopBorderDistance")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |