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

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Tue May 14 08:26:47 UTC 2019


 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e2a0fa096fd2fd87365bd91c4b080bede686095d
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue May 14 16:53:57 2019 +0900
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 14 10:26:06 2019 +0200

    Look for "online" theme when running LOOL and "ios" only on IOS
    
    Change-Id: I5ac2c764dd11381d6354a7727700ba1fa4b76a53
    Reviewed-on: https://gerrit.libreoffice.org/72271
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 7c86d04b084b..9e84edc2ba3e 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -93,8 +93,12 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
     : m_rGraphics(rGraphics)
     , m_bIsActive(false)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        m_pWidgetDefinition = getWidgetDefinitionForTheme("online");
+#ifdef IOS
     if (!m_pWidgetDefinition)
         m_pWidgetDefinition = getWidgetDefinitionForTheme("ios");
+#endif
 
     if (m_pWidgetDefinition)
     {


More information about the Libreoffice-commits mailing list