[Libreoffice-commits] core.git: Branch 'aoo/trunk' - canvas/source

[Yuri Dario]

 canvas/source/cairo/cairo_os2_cairo.cxx  |    6 +++++-
 canvas/source/cairo/cairo_textlayout.cxx |    9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 8b8df380310b2ba0c92ddff97361b0c4989d659f
Author: Yuri Dario <ydario at apache.org>
Date:   Wed Mar 7 14:46:14 2018 +0000

    #i127723# Fix StarSymbol to OpenSymbol mapping when using cairo on OS/2.

diff --git a/canvas/source/cairo/cairo_os2_cairo.cxx b/canvas/source/cairo/cairo_os2_cairo.cxx
index 788b51e3897f..e9b4912be7a6 100644
--- a/canvas/source/cairo/cairo_os2_cairo.cxx
+++ b/canvas/source/cairo/cairo_os2_cairo.cxx
@@ -327,7 +327,11 @@ namespace cairo
         fontAttrs.usCodePage = 850;
         fontAttrs.fsType = FATTR_TYPE_MBCS;
         fontAttrs.fsFontUse = FATTR_FONTUSE_NOMIX;
-        strcpy( fontAttrs.szFacename, font);
+        // map StarSymbol to OpenSymbol
+        if (strcmp( font, "StarSymbol") == 0)
+            strcpy( fontAttrs.szFacename, "OpenSymbol");
+        else
+            strcpy( fontAttrs.szFacename, font);
         rc = Ft2CreateLogFont( hps, NULL, 1L, &fontAttrs);
         rc = Ft2SetCharSet( hps, 1L);
 
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 4fb559ec8a0a..b8eff6393c16 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -546,8 +546,13 @@ namespace cairocanvas
                                             CAIRO_FONT_SLANT_NORMAL : CAIRO_FONT_SLANT_ITALIC);
             cairo_font_weight_t weight = (rOutDev.GetFont().GetWeight() == WEIGHT_NORMAL ?
                                               CAIRO_FONT_WEIGHT_NORMAL : CAIRO_FONT_WEIGHT_BOLD);
-            cairo_select_font_face( pSCairo.get(), aFontName,
-                                    slant, weight);
+            // map StarSymbol to OpenSymbol
+            if (aFontName.equals("StarSymbol"))
+                cairo_select_font_face( pSCairo.get(), "OpenSymbol",
+                                        slant, weight);
+            else
+                cairo_select_font_face( pSCairo.get(), aFontName,
+                                        slant, weight);
     #endif
 
             if (font_face)