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

[Ashod Nakashian (via logerrit)]

 cui/source/tabpages/backgrnd.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit b124f068d12de289f5ae1fe5898b048cf15932a9
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun May 26 15:52:29 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Mon Nov 25 13:48:40 2019 +0100

    cui: LOK: Disable browsing for background images in LOK
    
    LOK doesn't support browsing the file system, so
    disable the browse button to allow the user to
    still use the other settings, if they are editing
    a file with a background image.
    
    (cherry picked from commit f5f271e755c384ce0a6eff85fb55b14b9083f394)
    
    Change-Id: I604f0a8e2bd4d25e35f40f959754b3d98c33c9fe
    Reviewed-on: https://gerrit.libreoffice.org/83634
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9c29a1ae725a..2c7e2e8e22c1 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -52,6 +52,7 @@
 #include <vcl/GraphicObject.hxx>
 
 #include <svx/unobrushitemhelper.hxx>
+#include <comphelper/lok.hxx>
 
 using namespace css;
 
@@ -315,6 +316,10 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(TabPageParent pParent, const SfxItemS
     m_xBackgroundColorSet->SetSelectHdl(HDL(BackgroundColorHdl_Impl));
     m_xBackgroundColorSet->SetStyle(m_xBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD);
     m_xBackgroundColorSet->SetText(SvxResId(RID_SVXSTR_NOFILL));
+
+    // Browsing files is not supported in LOK.
+    if (comphelper::LibreOfficeKit::isActive())
+        m_xBtnBrowse->hide();
 }
 
 SvxBackgroundTabPage::~SvxBackgroundTabPage()