summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-08-21 11:41:26 +0100
committerAndras Timar <andras.timar@collabora.com>2023-08-26 11:30:47 +0200
commit9f544a913622a89f5fbbdf6a07aa4e9ee19af959 (patch)
tree9e9869ea47beebefbb6fcfc8ba12bda77c17c3ac
parent02701941e31d98635fca511a6a149533a4a32a1c (diff)
spellchecking wave doesn't extend to the full width of superscript text
or subscript, e.g. enter tmalltmalltmalltmalltmalltmalltmall in impress, format character, position, superscript, ok and without this change the wave extends only 80% of the width of the misspelt text Change-Id: I5d3ad61541152199809c950349533ca3fa7ed1c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155890 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 8ec43f37a7a5babe9227a5ca1ea84720fc2e15e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155924 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 5d7c51208154..66c97d29b9b1 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -168,11 +168,9 @@ namespace
// look for proportional font scaling, if necessary, scale accordingly
sal_Int8 nPropr(rInfo.mrFont.GetPropr());
- if(100 != nPropr)
- {
- const double fFactor(rInfo.mrFont.GetPropr() / 100.0);
- aNewTransform.scale(fFactor, fFactor);
- }
+ const double fPropFontFactor(nPropr / 100.0);
+ if (100 != nPropr)
+ aNewTransform.scale(fPropFontFactor, fPropFontFactor);
// apply font rotate
if(rInfo.mrFont.GetOrientation())
@@ -439,7 +437,7 @@ namespace
// need to take FontScaling out of values; it's already part of
// aNewTransform and would be double applied
- const double fFontScaleX(aFontScaling.getX());
+ const double fFontScaleX(aFontScaling.getX() * fPropFontFactor);
if(!basegfx::fTools::equal(fFontScaleX, 1.0)
&& !basegfx::fTools::equalZero(fFontScaleX))