tdf#128197: sw: different line height for DOCX with compat=14
commitee7b6c773eb22268fefee4bfcc10110b0bbbd8cf
authorVasily Melenchuk <vasily.melenchuk@cib.de>
Thu, 11 Jun 2020 06:45:03 +0000 (11 09:45 +0300)
committerThorsten Behrens <Thorsten.Behrens@CIB.de>
Wed, 24 Jun 2020 11:10:27 +0000 (24 13:10 +0200)
tree21cf71c5762ff0d8b477eb3ae5be633824ec7900
parentd0cf50c553ea738de1a35fcc4feec4021ab7ebe0
tdf#128197: sw: different line height for DOCX with compat=14

Lines containing just a shape inline without any other text are
treated in DOCX with compatibility option 15 and 14 in a different
way: while compat=15 is layouting line exatly as LO does, in
compat=14 mode minimal line height takes into account just shape
height and not current font.

Change-Id: Id2bdab941a0bbaa9080567d736435d9e0babd490
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96080
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
sw/inc/IDocumentSettingAccess.hxx
sw/qa/extras/ooxmlexport/data/128197_compat14.docx [new file with mode: 0644]
sw/qa/extras/ooxmlexport/data/128197_compat15.docx [new file with mode: 0644]
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
sw/source/core/doc/DocumentSettingManager.cxx
sw/source/core/inc/DocumentSettingManager.hxx
sw/source/core/text/itrform2.cxx
sw/source/uibase/uno/SwXDocumentSettings.cxx
writerfilter/source/dmapper/SettingsTable.cxx