[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svx/source

[Noel Grandin (via logerrit)]

 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1db6ef546e514385058c04041fb2849411224d33
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 11 10:29:50 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 19 11:53:11 2023 +0200

    tdf#157173 Enlarging Fontwork shape replaces used font
    
    regression from
        commit b153d147c9d813f78dd551fc186c261f52c929a1
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Wed Apr 28 15:27:14 2021 +0200
        remove support for BITMASK in vcl backends
    
    So the code that I removed had
        if (meFormat == DeviceFormat::BITMASK)
            SetAntialiasing( AntialiasingFlags::DisableText );
    in the
        VirtualDevice::ImplInitVirDev
    method.
    
    Possibly we will need to make similar fixes in other places that used
    BITMASK, but this looks like the only spot that really needs it.
    
    No idea exactly how this line of code relates to the observed bug
    though.
    
    Change-Id: I858f15cf70a452568128d5ccccb365d9a11f7062
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156815
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 819dec3533750a3a8f483351febe40aae85ca0b7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156740
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index d40d22e987c9..7d7ee4fdbc81 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -230,6 +230,7 @@ static void CalculateHorizontalScalingFactor(
     ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
     pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
     pVirDev->SetFont( aFont );
+    pVirDev->SetAntialiasing( AntialiasingFlags::DisableText );
 
     if ( nOutlinesCount2d & 1 )
         bSingleLineMode = true;
@@ -343,6 +344,8 @@ static void GetTextAreaOutline(
             ScopedVclPtrInstance< VirtualDevice > 
pVirDev(DeviceFormat::WITHOUT_ALPHA);
             pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
             pVirDev->SetFont( aFont );
+            pVirDev->SetAntialiasing( AntialiasingFlags::DisableText );
+
             pVirDev->EnableRTL();
             if ( rParagraph.nFrameDirection == 
SvxFrameDirection::Horizontal_RL_TB )
                 pVirDev->SetLayoutMode( 
vcl::text::ComplexTextLayoutFlags::BiDiRtl );