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

[Libreoffice Gerrit user]

 vcl/source/font/OpenTypeFeatureDefinitonList.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e46561f087e923bc0d9ad03758c270b06d201fb
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Jul 30 10:23:26 2018 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Jul 30 13:29:38 2018 +0200

    fix OT font feature description ssxx and cvxx mixup
    
    Change-Id: I20e169fede237e4760f8be905e70a3ed964c402f
    Reviewed-on: https://gerrit.libreoffice.org/58305
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
index 1c75d46031c7..93b5e6d67550 100644
--- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
+++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
@@ -164,9 +164,9 @@ OpenTypeFeatureDefinitonListPrivate::handleSpecialFeatureCode(sal_uInt32 nFeatur
     if (!sNumericPart.isEmpty())
     {
         if (isCharacterVariantCode(nFeatureCode))
-            aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_SSXX, sNumericPart };
-        else if (isStylisticSetCode(nFeatureCode))
             aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_CVXX, sNumericPart };
+        else if (isStylisticSetCode(nFeatureCode))
+            aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_SSXX, sNumericPart };
     }
     return aFeatureDefinition;
 }