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

[خالد حسني (via logerrit)]

 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 6014fd047a62e1a002cc27334e39e1d2e54e342f
Author:     خالد حسني <kha...@libreoffice.org>
AuthorDate: Mon Jun 5 15:11:18 2023 +0200
Commit:     خالد حسني <kha...@libreoffice.org>
CommitDate: Mon Jun 5 16:54:37 2023 +0200

    Revert "tdf#155676: Use colon in FontsUseWinMetrics config key"
    
    This reverts commit a38e1537cd06367783a43cc8d3b0e8d674b6e142.
    
    Change-Id: Ic72f1acb7e38209e9b87a8fe80a39acb1eeacfe4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152547
    Tested-by: Jenkins
    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 2eb90331ad33..f47edadcae0f 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 f9740704ca96..8a998c6815c6 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());