diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-26 11:54:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-26 13:07:18 +0100 |
| commit | 1da6609eb8d3d70bb620d949b1935a5789c2d2ce (patch) | |
| tree | c3199338597952bb0a6c8f3db753a5305c6bbf7f /sw | |
| parent | 52cd29a3388ec29d4de8423bb0979bcfb7a7cfcd (diff) | |
DOCX import: default para style has priority over table styles
Since commit 23b67c536537c91020cf5a45ab5cb36d7316ed89 (DOCX import: fix
import of font size in table styles, 2013-03-04) we simply ignored all
table style run props, that indeed fixed testTableStylerPrSz, but broke
cases when otherwise reasonable run properties were specified in table
styles.
Fix this by only ignoring run props of table styles if the default para
style should have priority.
Change-Id: Ic10f635f4b8688af252214d5d38216b4d5c8fa8e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 5a3a554ecf0c..8fa9ded37802 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1398,6 +1398,9 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, "calendar2.docx") // Font size in the second row was 11. xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(16.f, getProperty<float>(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); + // Font size in the third row was 11 as well. + xCell.set(xTable->getCellByName("A3"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(14.f, getProperty<float>(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); // This paragraph property was missing in table style. xmlDocPtr pXmlStyles = parseExport("word/styles.xml"); |