[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Wed May 15 10:43:31 UTC 2019


 vcl/headless/svpgdi.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7d55c2b8886ae00a60aa469503f596ee488c25c0
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed May 15 12:25:26 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 15 12:42:38 2019 +0200

    Attempt to load the theme when LibreOfficeKit is active.
    
    Change-Id: Ie8640b7179a96cb40fb774ede097ca7b3640edd8
    Reviewed-on: https://gerrit.libreoffice.org/72349
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 11c6fc1d9589..db62e92585a2 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -562,9 +562,10 @@ SvpSalGraphics::SvpSalGraphics()
     , m_ePaintMode(PaintMode::Over)
     , m_aTextRenderImpl(*this)
 {
-    if (!initWidgetDrawBackends())
+    bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+    if (!initWidgetDrawBackends(bLOKActive))
     {
-        if (comphelper::LibreOfficeKit::isActive())
+        if (bLOKActive)
             m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this));
     }
 }


More information about the Libreoffice-commits mailing list