officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8 ++++----
vcl/source/font/fontmetric.cxx | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a38e1537cd06367783a43cc8d3b0e8d674b6e142
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Mon Jun 5 07:47:47 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Mon Jun 5 08:42:28 2023 +0200
tdf#155676: Use colon in FontsUseWinMetrics config key
The use of comma breaks editing in Expert Configuration dialog, so users
effectively can’t use this.
After editing
<it>Celticmd,1571,-567,1571,-547,2126,559</it>
becomes
<it>Celticmd</it><it>1571</it><it>-567</it><it>1571</it><it>-547</it><it>2126</it><it>559</it>
Using colon instead of comma seems to fix this.
Change-Id: I4bba26fe9d94a33e62a0d34c3324daae0845c30b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152597
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f47edadcae0f..2eb90331ad33 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5126,12 +5126,12 @@
</info>
<value>
<!-- tdf#148122 Celtic MD font appears wrong -->
- <it>Celticmd,1571,-567,1571,-547,2126,559</it>
+ <it>Celticmd:1571:-567:1571:-547:2126:559</it>
<!-- DIN Light (ttf version) has odd metrics. The otf version works
fine. -->
- <it>DIN Light,1509,-503,1509,-483,1997,483</it>
+ <it>DIN Light:1509:-503:1509:-483:1997:483</it>
<!-- tdf#155297 -->
- <it>B Nazanin,1343,-705,1990,-1045,1990,1045</it> <!-- Regular -->
- <it>B Nazanin,1341,-707,2126,-1120,2126,1120</it> <!-- Bold -->
+ <it>B Nazanin:1343:-705:1990:-1045:1990:1045</it> <!-- Regular -->
+ <it>B Nazanin:1341:-707:2126:-1120:2126:1120</it> <!-- Bold -->
</value>
</prop>
<prop oor:name="FontsDontUseUnderlineMetrics" oor:type="oor:string-list"
oor:nillable="false">
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 8a998c6815c6..f9740704ca96 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -400,10 +400,10 @@ bool ImplFontMetricData::ShouldUseWinMetrics(int nAscent,
int nDescent, int nTyp
return false;
OUString aFontIdentifier(
- GetFamilyName() + ","
- + OUString::number(nAscent) + "," + OUString::number(nDescent) + ","
- + OUString::number(nTypoAscent) + "," + OUString::number(nTypoDescent)
+ ","
- + OUString::number(nWinAscent) + "," + OUString::number(nWinDescent));
+ GetFamilyName() + ":"
+ + OUString::number(nAscent) + ":" + OUString::number(nDescent) + ":"
+ + OUString::number(nTypoAscent) + ":" + OUString::number(nTypoDescent)
+ ":"
+ + OUString::number(nWinAscent) + ":" + OUString::number(nWinDescent));
css::uno::Sequence<OUString> rWinMetricFontList(
officecfg::Office::Common::Misc::FontsUseWinMetrics::get());
