diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-31 22:43:51 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-01 10:12:29 +0200 |
| commit | aaa6a5202a447fb4e86d5f016d8e79fbc34a3ed7 (patch) | |
| tree | 1306fda3eeb4f9f20e15f56809d0f3205a6087c8 /sw | |
| parent | d99cc336d8476975a9fd7adf01b4b9f9cd917aaa (diff) | |
tdf#109790 RTF import: keep remembering paragraph style between \cell and \row
This is the opposite situation as tdf#44715, where the problem was that
style was not reset between in-cell paragraphs.
Here we don't want to reset the paragraph style too early, so that
direct (character) formatting isn't lost just because the theoretical
end-of-row character would not have the same direct formatting.
Change-Id: I9bb54f37804f5889fb10504ae890362a2e42122c
Reviewed-on: https://gerrit.libreoffice.org/40609
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/tdf109790.rtf | 16 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 8 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/tdf109790.rtf b/sw/qa/extras/rtfexport/data/tdf109790.rtf new file mode 100644 index 000000000000..c25c11622812 --- /dev/null +++ b/sw/qa/extras/rtfexport/data/tdf109790.rtf @@ -0,0 +1,16 @@ +{\rtf1\adeflang1037\ansi\ansicpg1252\uc1\adeff0\deff0 +\noqfpromote +{\stylesheet +{\ql \li0\ri0\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \afs20\alang1037 \ltrch\fcs0 +\fs20\lang1033\langfe1033\loch\f0\hich\dbch\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;} +{\s26\fs44 \sbasedon0 \snext26 \slink27 \sqformat Subtitle;} +} +\paperw12240\paperh15840 +\pard\plain Start.\par +\trowd\cellx2310\pard\plain\s26\intbl +{\fs20 XXXX} +{\fs20 \cell } +\pard +{\row } +\pard\plain End.\par +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 9f75068be62f..9f3b558e5bdb 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1231,6 +1231,14 @@ DECLARE_RTFEXPORT_TEST(testWatermark, "watermark.rtf") CPPUNIT_ASSERT_EQUAL((float)66, nFontSize); } +DECLARE_RTFEXPORT_TEST(testTdf109790, "tdf109790.rtf") +{ + uno::Reference<text::XTextTable> xTable(getParagraphOrTable(2), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); + // Style information was reset, which caused character height to be 22. + CPPUNIT_ASSERT_EQUAL(10.f, getProperty<float>(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |