core.git: vcl/source

[Julien Nabet (via logerrit)]

 vcl/source/font/FeatureCollector.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 378dd9025e39f7a4e575ba09b7bde8e038fc0b26
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Oct 3 19:29:32 2024 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Oct 3 19:30:58 2024 +0200

    Revert "tdf#163213: do not show OpenType features if the font has "morx" 
table"
    
    Reason: regression
    See https://bugs.documentfoundation.org/show_bug.cgi?id=163213#c14
    
    This reverts commit 0679a5cee16ae96c0d11e7d4fc1e59fb0f9cc591.
    
    Change-Id: Ib1392e2ad44577f69e6197bad8ae79791f072086
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174435
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/vcl/source/font/FeatureCollector.cxx 
b/vcl/source/font/FeatureCollector.cxx
index 767d8c39aa73..3e8e2e76e8a5 100644
--- a/vcl/source/font/FeatureCollector.cxx
+++ b/vcl/source/font/FeatureCollector.cxx
@@ -14,7 +14,6 @@
 #include <font/OpenTypeFeatureStrings.hrc>
 #include <svdata.hxx>
 
-#include <hb-aat.h>
 #include <hb-ot.h>
 #include <hb-graphite2.h>
 
@@ -196,9 +195,7 @@ bool FeatureCollector::collect()
     }
     else
     {
-        // tdf#163213: Font Features dialog should not show OpenType features 
if the font has "morx" table
-        if (!hb_aat_layout_has_substitution(m_pHbFace))
-            collectForTable(HB_OT_TAG_GSUB); // substitution
+        collectForTable(HB_OT_TAG_GSUB); // substitution
         collectForTable(HB_OT_TAG_GPOS); // positioning
         return true;
     }