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

[Jan Holesovsky (via logerrit)]

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

New commits:
commit ba6a94476f8c32950fa96aeca64325d627c4d410
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: Tue Sep 3 16:25:32 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>
    (cherry picked from commit 7d55c2b8886ae00a60aa469503f596ee488c25c0)
    Reviewed-on: https://gerrit.libreoffice.org/72353
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/78561

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index aa697055030d..b0f6f530e8bd 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -596,9 +596,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));
     }
 }