-
Miklos Vajna yazdı
This is a combination of 3 commits. 1st commit: Longer term the core Impress shape has to be improved so that it can have text in multiple columns. Shorter term, map text with multiple columns to table shapes, that gives correct layout in many cases and requires changes to the import filter only. (cherry picked from commit aef569ed) Commit #2: Related: tdf#120028 PPTX import: fix font size of multi-col shape text Normal shapes have a TextFitToSize property for this, but table cell content has to be scaled manually, as the rendering has no automatic support for them. Luckily the file format has the info we need to scale at import time. (cherry picked from commit c8b2849d) Commit #3: Related: tdf#120028 PPTX import: fix font color of multi-col shape text Not just font color, anything defined via list styles were not imported. (cherry picked from commit 800bf107) Conflicts: oox/inc/drawingml/textbodyproperties.hxx Reviewed-on: https://gerrit.libreoffice.org/61244 Tested-by: Jenkins Reviewed-by:
Andras Timar <andras.timar@collabora.com> (cherry picked from commit 6f1fb474) Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c
78b11422