commit 0c9448bb31a32a3bf4004d45c4b1305debf1b5e2
author Khaled Hosny <khaled@aliftype.com> Fri Feb 17 21:32:20 2023 +0200
committer خالد حسني <khaled@aliftype.com> Fri Feb 17 22:23:53 2023 +0000
tree f34fd5279ddeb38c937ffa873865e793b511cbfa
parent ead66494deda4590d9202a96d4aa9589751412a1

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 <th@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: خالد حسني <khaled@aliftype.com>

include/svtools/strings.hrc

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 96c3ef6..c77d3f6 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -153,6 +153,8 @@
#define STR_SVT_STYLE_LIGHT_ITALIC              NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic")
#define STR_SVT_STYLE_NORMAL                    NC_("STR_SVT_STYLE_NORMAL", "Regular")
#define STR_SVT_STYLE_NORMAL_ITALIC             NC_("STR_SVT_STYLE_NORMAL_ITALIC", "Italic")
#define STR_SVT_STYLE_MEDIUM                    NC_("STR_SVT_STYLE_MEDIUM", "Medium")
#define STR_SVT_STYLE_MEDIUM_ITALIC             NC_("STR_SVT_STYLE_MEDIUM_ITALIC", "Medium Italic")
#define STR_SVT_STYLE_BOLD                      NC_("STR_SVT_STYLE_BOLD", "Bold")
#define STR_SVT_STYLE_BOLD_ITALIC               NC_("STR_SVT_STYLE_BOLD_ITALIC", "Bold Italic")
#define STR_SVT_STYLE_BLACK                     NC_("STR_SVT_STYLE_BLACK", "Black")

svtools/source/control/ctrltool.cxx

diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 508ee9b..438b229 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,15 +481,17 @@ 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")
            aStyleName = SvtResId(STR_SVT_STYLE_SEMIBOLD);
        else if (aCompareStyleName == "semibolditalic")
            aStyleName = SvtResId(STR_SVT_STYLE_SEMIBOLD_ITALIC);
        // tdf#147739 medium is not a synonym of normal
        else if (aCompareStyleName == "medium")
            aStyleName = SvtResId(STR_SVT_STYLE_MEDIUM);
        else if (aCompareStyleName == "mediumitalic")
            aStyleName = SvtResId(STR_SVT_STYLE_MEDIUM_ITALIC);

        // fix up StyleName, because the PS Printer driver from
        // W2000 returns wrong StyleNames (e.g. Bold instead of Bold Italic