diff options
| -rw-r--r-- | include/svtools/strings.hrc | 2 | ||||
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index 96c3ef64e24a..c77d3f6cfe7d 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") diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 508ee9b9092b..438b229c73a7 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 |