core.git: vcl/source

[خالد حسني (via logerrit)]

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

New commits:
commit 742dbb088b44783c3a4f0fd120b11be3a74fd483
Author:     خالد حسني <kha...@libreoffice.org>
AuthorDate: Fri Mar 28 00:20:49 2025 +0100
Commit:     خالد حسني <kha...@libreoffice.org>
CommitDate: Fri Mar 28 02:25:46 2025 +0100

    Revert^2 "tdf#163213: do not show OpenType features if the font has "morx" 
table"
    
    This reverts commit 378dd9025e39f7a4e575ba09b7bde8e038fc0b26.
    
    Reason for revert: The user report that resulted in the first revert was 
bogus and based on user misunderstanding
    
    Change-Id: I511386fb66bb1026da46cef9939c7108f9516318
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183423
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@libreoffice.org>

diff --git a/vcl/source/font/FeatureCollector.cxx 
b/vcl/source/font/FeatureCollector.cxx
index 3e8e2e76e8a5..767d8c39aa73 100644
--- a/vcl/source/font/FeatureCollector.cxx
+++ b/vcl/source/font/FeatureCollector.cxx
@@ -14,6 +14,7 @@
 #include <font/OpenTypeFeatureStrings.hrc>
 #include <svdata.hxx>
 
+#include <hb-aat.h>
 #include <hb-ot.h>
 #include <hb-graphite2.h>
 
@@ -195,7 +196,9 @@ bool FeatureCollector::collect()
     }
     else
     {
-        collectForTable(HB_OT_TAG_GSUB); // substitution
+        // 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_GPOS); // positioning
         return true;
     }