diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 09:27:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 10:19:02 +0000 |
| commit | 38b0c24fa5cbb4246e03d77ac022dfdc9fdede03 (patch) | |
| tree | 6c500a9f343126a28508aaa2adc581d819a2eb96 | |
| parent | a82627aa787e80c9473453acd5ec955b6cf265ff (diff) | |
Related: tdf#105454 DOCX import: fix unwanted enabled-by-default kerning
Similar to DOC, DOCX doesn't enable kerning by default.
Change-Id: I070ff5f0d43c27107593d629a1ad681d29d2038c
Reviewed-on: https://gerrit.libreoffice.org/35890
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/kern.docx | bin | 0 -> 12832 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 7 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/kern.docx b/sw/qa/extras/ooxmlimport/data/kern.docx Binary files differnew file mode 100644 index 000000000000..b66130d38d03 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/kern.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index c4b5fe5dd706..7fb3871f32ed 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -648,6 +648,13 @@ DECLARE_OOXMLIMPORT_TEST(testN820504, "n820504.docx") CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType")); } +DECLARE_OOXMLIMPORT_TEST(testKern, "kern.docx") +{ + CPPUNIT_ASSERT(getProperty<bool>(getRun(getParagraph(1), 1), "CharAutoKerning")); + // This failed: kerning was also enabled for the second paragraph. + CPPUNIT_ASSERT(!getProperty<bool>(getRun(getParagraph(2), 1), "CharAutoKerning")); +} + DECLARE_OOXMLIMPORT_TEST(testFdo43641, "fdo43641.docx") { uno::Reference<container::XIndexAccess> xGroupShape(getShape(1), uno::UNO_QUERY); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index b35d762c69b7..1a25933a8dc6 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -298,6 +298,10 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT, aVal ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal ); + + // See SwDoc::RemoveAllFormatLanguageDependencies(), internal filters + // disable kerning by default, do the same here. + m_pDefaultCharProps->Insert(PROP_CHAR_AUTO_KERNING, uno::Any(false)); } |