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

[Khaled Hosny (via logerrit)]

 vcl/inc/sft.hxx                      |    6 ++----
 vcl/source/font/PhysicalFontFace.cxx |    4 ++--
 vcl/source/fontsubset/sft.cxx        |    1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit dc9270d207af24c9b5cd775eda8997f3aad68f14
Author:     Khaled Hosny <kha...@aliftype.com>
AuthorDate: Sat Oct 1 17:27:46 2022 +0200
Commit:     خالد حسني <kha...@aliftype.com>
CommitDate: Sat Oct 1 19:47:48 2022 +0200

    Unused constants
    
    Change-Id: Ic43a4e52b5ea40e54b368815e504840cb2c78aab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140845
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@aliftype.com>

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index dc539ab958ac..25c8fe693c3a 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -448,7 +448,6 @@ constexpr sal_uInt32 T_post = 0x706F7374;
 constexpr sal_uInt32 T_cvt  = 0x63767420;
 constexpr sal_uInt32 T_prep = 0x70726570;
 constexpr sal_uInt32 T_fpgm = 0x6670676D;
-constexpr sal_uInt32 T_gsub = 0x47535542;
 constexpr sal_uInt32 T_CFF  = 0x43464620;
 
 class AbstractTrueTypeFont;
@@ -708,9 +707,8 @@ constexpr int O_post = 11;   /* 'post' */
 constexpr int O_cvt  = 12;   /* 'cvt_' - only used in TT->TT generation */
 constexpr int O_prep = 13;   /* 'prep' - only used in TT->TT generation */
 constexpr int O_fpgm = 14;   /* 'fpgm' - only used in TT->TT generation */
-constexpr int O_gsub = 15;   /* 'GSUB' */
-constexpr int O_CFF = 16;   /* 'CFF' */
-constexpr int NUM_TAGS = 17;
+constexpr int O_CFF = 15;   /* 'CFF' */
+constexpr int NUM_TAGS = 16;
 
 class VCL_DLLPUBLIC AbstractTrueTypeFont
 {
diff --git a/vcl/source/font/PhysicalFontFace.cxx 
b/vcl/source/font/PhysicalFontFace.cxx
index d1c02bbcc62d..05f9a4519b61 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -335,8 +335,8 @@ class TrueTypeFace final : public AbstractTrueTypeFont
     {
         assert(nIdx < NUM_TAGS);
         static const uint32_t aTags[NUM_TAGS] = {
-            T_maxp, T_glyf, T_head, T_loca, T_name, T_hhea, T_hmtx, T_cmap, 
T_vhea,
-            T_vmtx, T_OS2,  T_post, T_cvt,  T_prep, T_fpgm, T_gsub, T_CFF,
+            T_maxp, T_glyf, T_head, T_loca, T_name, T_hhea, T_hmtx, T_cmap,
+            T_vhea, T_vmtx, T_OS2,  T_post, T_cvt,  T_prep, T_fpgm, T_CFF,
         };
         if (m_aTableList[nIdx].empty())
             m_aTableList[nIdx] = std::move(m_aFace.GetTable(aTags[nIdx]));
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index a0961c36542c..2079cefbb1a6 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1356,7 +1356,6 @@ SFErrCodes TrueTypeFont::open(sal_uInt32 facenum)
             case T_cvt : nIndex = O_cvt;  break;
             case T_prep: nIndex = O_prep; break;
             case T_fpgm: nIndex = O_fpgm; break;
-            case T_gsub: nIndex = O_gsub; break;
             case T_CFF:  nIndex = O_CFF; break;
             default: nIndex = -1; break;
         }