[Libreoffice-commits] core.git: 2 commits - cui/source vcl/qa

[Luboš Luňák (via logerrit)]

 cui/source/options/optgdlg.cxx |    3 +++
 vcl/qa/cppunit/text.cxx        |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit d34f1df73806e9ca05fa0d07da619e2c0f01b6f7
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Aug 18 18:38:56 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Aug 23 15:01:14 2021 +0200

    enable the UI option to enable Skia on Mac too
    
    Change-Id: I3b4d96a3defaa9d6fdfba54f1da4d8be246367e4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120813
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 12b973380b89..b353325f1b53 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -633,6 +633,9 @@ void OfaViewTabPage::UpdateSkiaStatus()
     // It can also be used on Linux, but only with the rarely used 'gen' backend.
     if (Application::GetToolkitName() == "x11")
         skiaHidden = false;
+    // OSX backend has Skia support too.
+    if (Application::GetToolkitName() == "osx")
+        skiaHidden = false;
 
     if (skiaHidden)
     {
commit 07eab10f5795d7cd58620f0ce1dcf04f6f713c5a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Aug 18 18:34:56 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Aug 23 15:01:00 2021 +0200

    disable vertical text test for Mac/Skia
    
    It's broken on Mac, with or without Skia, so disable the test at least
    for now.
    
    Change-Id: I93b9a8d0bcbd275bbb0d54cc412b2df13581ad41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120812
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx
index b50feb0fe5a0..19e5da942932 100644
--- a/vcl/qa/cppunit/text.cxx
+++ b/vcl/qa/cppunit/text.cxx
@@ -253,6 +253,9 @@ void VclTextTest::testVerticalText()
         || device->GetGraphics()->getRenderBackendName() == "gtk3svp"
         || device->GetGraphics()->getRenderBackendName() == "aqua"
         || device->GetGraphics()->getRenderBackendName() == "gen"
+#ifdef MACOSX // vertical fonts are broken on Mac with or without Skia
+        || device->GetGraphics()->getRenderBackendName() == "skia"
+#endif
         || device->GetGraphics()->getRenderBackendName() == "genpsp")
         return;
 
@@ -260,8 +263,9 @@ void VclTextTest::testVerticalText()
     vcl::Font baseFont;
     vcl::Font font;
     bool fontFound = false;
-    for (const char* ptrfontName : { "Droid Sans Japanese", "Baekmuk Gulim", "Microsoft JhengHei",
-                                     "Microsoft YaHei", "MS PGothic" })
+    for (const char* ptrfontName :
+         { "Droid Sans Japanese", "Baekmuk Gulim", "Microsoft JhengHei", "Microsoft YaHei",
+           "MS PGothic", "Hiragino Sans", "Arial Unicode MS" })
     {
         OUString fontName = OUString::fromUtf8(ptrfontName);
         if (!device->IsFontAvailable(fontName))