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

[Khaled Hosny (via logerrit)]

 svtools/source/control/ctrltool.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit a36b806c0c4649f7d2a1dd35d2ebea5b2102077e
Author:     Khaled Hosny <kha...@aliftype.com>
AuthorDate: Fri Feb 17 21:32:20 2023 +0200
Commit:     خالد حسني <kha...@aliftype.com>
CommitDate: Sat Feb 18 12:55:26 2023 +0000

    tdf#147739: Medium is not a synonym of normal
    
    For some reason, medium was thought to be a synonym of normal, but that
    is not the case. Seems to be from:
    
    commit b05701988492b051b3bb07bb46ae0397e23f032f
    Author: th <t...@openoffice.org>
    Date:   Fri Mar 9 14:44:26 2001 +0000
    
        #83090# - Extensions for localized sytle names
        #77189# - FontAlias should now also work
        Extensions for Chinese fontsize numbers
    
    Change-Id: Ic5e463b6e77c0fa88701108597c99c9fa0c6bf4e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147258
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@aliftype.com>
    (cherry picked from commit 0c9448bb31a32a3bf4004d45c4b1305debf1b5e2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147249
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index 508ee9b9092b..0a406b708c76 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -452,8 +452,6 @@ OUString FontList::GetStyleName(const FontMetric& rInfo) 
const
             aStyleName = maNormal;
         else if (aCompareStyleName == "regular")
             aStyleName = maNormal;
-        else if (aCompareStyleName == "medium")
-            aStyleName = maNormal;
         else if (aCompareStyleName == "light")
             aStyleName = maLight;
         else if (aCompareStyleName == "lightitalic")
@@ -483,9 +481,6 @@ OUString FontList::GetStyleName(const FontMetric& rInfo) 
const
             aStyleName = SvtResId(STR_SVT_STYLE_EXTRALIGHT);
         else if (aCompareStyleName == "extralightitalic")
             aStyleName = SvtResId(STR_SVT_STYLE_EXTRALIGHT_ITALIC);
-        /* Medium is synonym with Normal */
-        else if (aCompareStyleName == "mediumitalic")
-            aStyleName = maNormalItalic;
         else if (aCompareStyleName == "oblique")
             aStyleName = SvtResId(STR_SVT_STYLE_OBLIQUE);
         else if (aCompareStyleName == "semibold")