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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 3 18:24:39 UTC 2021


 vcl/inc/sallayout.hxx      |    2 +-
 vcl/source/outdev/text.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b2edef8b437d0d885708c7d7f6a8da07b2f1f225
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 3 10:49:52 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 3 20:24:06 2021 +0200

    rename NeedFallback to HasFallbackRun
    
    Change-Id: Iec45f84b330fc4e4a62b352cb007747a19a27bed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121578
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 701be24a5e3e..8b5f41062e62 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -112,7 +112,7 @@ public:
     void        NeedFallback( int nMinRunPos, int nEndRunPos, bool bRTL )
                     { maFallbackRuns.AddRun( nMinRunPos, nEndRunPos, bRTL ); }
     // methods used by BiDi and glyph fallback
-    bool        NeedFallback() const
+    bool        HasFallbackRun() const
                     { return !maFallbackRuns.IsEmpty(); }
     bool        PrepareFallback(const SalLayoutGlyphsImpl* pGlyphsImpl);
 
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index f8ef45e59ea0..d37d1c13dbaa 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1286,7 +1286,7 @@ std::unique_ptr<SalLayout> OutputDevice::ImplLayout(const OUString& rOrigStr,
 
     // do glyph fallback if needed
     // #105768# avoid fallback for very small font sizes
-    if (aLayoutArgs.NeedFallback() && mpFontInstance->GetFontSelectPattern().mnHeight >= 3)
+    if (aLayoutArgs.HasFallbackRun() && mpFontInstance->GetFontSelectPattern().mnHeight >= 3)
         pSalLayout = ImplGlyphFallbackLayout(std::move(pSalLayout), aLayoutArgs, pGlyphs);
 
     if (flags & SalLayoutFlags::GlyphItemsOnly)


More information about the Libreoffice-commits mailing list