[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - cui/source

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

 cui/source/dialogs/FontFeaturesDialog.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 4b53ed912331e457722cf51cf3fe034d784de172
Author:     خالد حسني <kha...@aliftype.com>
AuthorDate: Sun Feb 26 18:14:29 2023 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Feb 27 04:01:09 2023 +0000

    Revert "Mark ssXX and cvXX off by default in font features dialog"
    
    This reverts commit 3f9a8a3b7656470cfcf04c18a46a7b7bbeca8950.
    
    Reason for revert: Needs more work, currently causes all ssXX and cvXX to 
be added to font string when the dialog is used.
    
    Change-Id: I07eff710a2813e60fa4de3c23eb0a3c31d40e41d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147811
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx 
b/cui/source/dialogs/FontFeaturesDialog.cxx
index f4f53f8c8655..ab6063c9b6c3 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -158,15 +158,7 @@ int 
FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFea
         else
         {
             if (nValue < 0)
-            {
-                // If feature is not set, we don’t know if it is enabled by
-                // default or not. But we know that stylistic sets and
-                // character variants are not enabled by default.
-                if (rFontFeature.isStylisticSet() || 
rFontFeature.isCharacterVariant())
-                    aCurrentItem.m_xCheck->set_state(TRISTATE_FALSE);
-                else
-                    aCurrentItem.m_xCheck->set_state(TRISTATE_INDET);
-            }
+                aCurrentItem.m_xCheck->set_state(TRISTATE_INDET);
             else
                 aCurrentItem.m_xCheck->set_state(nValue > 0 ? TRISTATE_TRUE : 
TRISTATE_FALSE);
             aCurrentItem.m_xCheck->set_label(aDefinition.getDescription());