[Libreoffice-commits] core.git: vcl/source

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Sat Apr 27 22:53:31 UTC 2019


 vcl/source/outdev/font.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 13e716b2cfce4d093d74b3a552251deb9f3b6832
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Apr 27 21:38:56 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sun Apr 28 00:51:52 2019 +0200

    tdf#124944 don't directly adjust fallback layouts
    
    These are adjusted via MultiSalLayout::AdjustLayout, as they
    just know their own text width, but not the full text width of
    the MultiSalLayout, so the adjustment is too large.
    
    The correct adjustment is done by preparing a DXArray for all
    glyphs, which is then passed to the individual font fallback
    layouts for general adjustment.
    
    Change-Id: I439527d03df4752e74ff94aee7775a95275be5e2
    Reviewed-on: https://gerrit.libreoffice.org/71440
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index c3f7343bb823..65fb116ae047 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1332,8 +1332,6 @@ std::unique_ptr<SalLayout> OutputDevice::getFallbackLayout(
         return nullptr;
     }
 
-    pFallback->AdjustLayout( rLayoutArgs );
-
     return pFallback;
 }
 


More information about the Libreoffice-commits mailing list