summaryrefslogtreecommitdiff
path: root/oox/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-09-21 16:28:58 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-09-21 19:57:02 +0200
commitc8b2849d140677f7b35523096eb2bc715b3dc507 (patch)
tree355afc14bb8d2a9f1e11d8c239a07ada0c966849 /oox/inc
parent4c945b22fc42eb7a52864018cbca88358e71fd4d (diff)
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. Change-Id: Ibbcc4b8685995261536cce88b8c0774e148f708e Reviewed-on: https://gerrit.libreoffice.org/60880 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
Diffstat (limited to 'oox/inc')
-rw-r--r--oox/inc/drawingml/textbodyproperties.hxx2
-rw-r--r--oox/inc/drawingml/textcharacterproperties.hxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx
index 247851ef6cc8..785f117568a9 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -44,6 +44,8 @@ struct TextBodyProperties
OUString msPrst;
/// Number of requested columns.
sal_Int32 mnNumCol = 1;
+ /// Normal autofit: font scale (default: 100%).
+ sal_Int32 mnFontScale = 100000;
explicit TextBodyProperties();
diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx
index 4dfab74e3c1f..a034121e47d0 100644
--- a/oox/inc/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/drawingml/textcharacterproperties.hxx
@@ -47,6 +47,8 @@ struct TextCharacterProperties
Color maHighlightColor;
OptValue< OUString > moLang;
OptValue< sal_Int32 > moHeight;
+ /// If a font scale has to be applied manually to moHeight.
+ OptValue< double > moFontScale;
OptValue< sal_Int32 > moSpacing;
OptValue< sal_Int32 > moUnderline;
OptValue< sal_Int32 > moBaseline;