diff options
| author | Justin Luth <justin.luth@collabora.com> | 2019-11-29 12:22:15 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2019-11-29 19:48:32 +0100 |
| commit | a070fb8e87e0712de5336a9683208b6b277ce9b9 (patch) | |
| tree | 14b2f2f8fd0368b5e176d57d4a35120cb9b4d4fb /sw | |
| parent | f9fd9d4cd4f792cd4ec8e14df78f3193653dae67 (diff) | |
tdf#118947 writerfilter: remove obsolete tablestyle fontsize hack
LO 6.5 commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c
obsoletes this old hack. The default paragraph style has
(almost) nothing to do with table styles.
*Any* specified (non-inherited) paragraph style property
should override a table style, including the default paratyle.
One exception is the default occurance of the
not-yet-supported word/settings.xml compat option
overrideTableStyleFontSizeAndJustification = false.
The default case should cause the table-style font to override
a size 11 or 12 default-paragraph-style font. So that is actually
double-reason to remove this old hack which threw out
the table-style size altogether.
Change-Id: Id1687f32b8431b6fa8770b01c344e75e0ffb344f
Reviewed-on: https://gerrit.libreoffice.org/84044
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/calendar4.docx | bin | 0 -> 9218 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/calendar4.docx b/sw/qa/extras/ooxmlexport/data/calendar4.docx Binary files differnew file mode 100644 index 000000000000..ecf71d8a340a --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/calendar4.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index c78ecb5aff38..b11f3f0d45e5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -320,6 +320,15 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar3, "calendar3.docx") CPPUNIT_ASSERT_EQUAL(16.f, getProperty<float>(getRun(xCell,1), "CharHeight")); } +DECLARE_OOXMLEXPORT_TEST(testCalendar4, "calendar4.docx") +{ + // TableStyle:fontsize - overrides DocDefaults, but not Style. + // In this case the style does not define anything (but does copy-inherit the DocDefaults size 36) + uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A3"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(14.f, getProperty<float>(getRun(xCell,1), "CharHeight")); +} + DECLARE_OOXMLEXPORT_TEST(testTcBorders, "testTcBorders.docx") { //fdo#76635 : Table borders are not getting preserved. |