core.git: Branch 'libreoffice-24-2' - 2 commits - drawinglayer/source

[Mike Kaganski (via logerrit)]

 drawinglayer/source/primitive2d/textlayoutdevice.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d1c31e3857b7f0c6b3fb72da0c967bfa2bdef015
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Apr 23 05:25:34 2024 +0500
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri May 3 18:27:18 2024 +0200

    Fix a thinko in 8a97f1ba8d9ccb65b2c89106de20666311d90c30
    
    Change-Id: I07bb67e9384470269d1fd3df087acee377cce729
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166490
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167052

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx 
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 3e5708a99de6..9de634076960 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -188,7 +188,7 @@ void TextLayouterDevice::setFontAttribute(const 
attribute::FontAttribute& rFontA
     }
     else
     {
-        mnFontScalingFixX = mnFontScalingFixY = 0;
+        mnFontScalingFixX = mnFontScalingFixY = 1.0;
     }
 }
 
commit 14c7b4249e822c218f912fcd3707226081363f7a
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Apr 22 14:45:37 2024 +0500
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri May 3 18:27:07 2024 +0200

    tdf#160773: handle 0-size font height
    
    Regression from commit cc3663bbaed4f65d64154e5f9abb51a5f622f710
    (tdf#160702: improve text positioning, 2024-04-20), where I didn't
    know yet that this was possible :-)
    
    Change-Id: I1316db48b8acbacd077eeb4a8989c3dbf7e4a7b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166425
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167051

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx 
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index afc0663aa4b0..3e5708a99de6 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -179,8 +179,17 @@ void TextLayouterDevice::setFontAttribute(const 
attribute::FontAttribute& rFontA
         = getVclFontFromFontAttribute(rFontAttribute, fFontScaleX, 
fFontScaleY, 0.0, rLocale);
     setFont(aFont);
     Size aFontSize = aFont.GetFontSize();
-    mnFontScalingFixY = fFontScaleY / aFontSize.Height();
-    mnFontScalingFixX = fFontScaleX / (aFontSize.Width() ? aFontSize.Width() : 
aFontSize.Height());
+    if (aFontSize.Height())
+    {
+        mnFontScalingFixY = fFontScaleY / aFontSize.Height();
+        // aFontSize.Width() is 0 for uninformly scaled fonts: see 
getVclFontFromFontAttribute
+        mnFontScalingFixX
+            = fFontScaleX / (aFontSize.Width() ? aFontSize.Width() : 
aFontSize.Height());
+    }
+    else
+    {
+        mnFontScalingFixX = mnFontScalingFixY = 0;
+    }
 }
 
 double TextLayouterDevice::getOverlineOffset() const