[Libreoffice-commits] core.git: svx/source

[gokaysatir (via logerrit)]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5aba7d0bc54a03247fbd5e6514f79fff846f527c
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 2 08:11:14 2020 +0200

    Online: Hide shape area bitmap import button.
    
    This patch is for Online.
    Online handles "import" actions differently. This patch disables "Import" button for only Online.
    
    Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100367
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100658
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5768e54002a0..60f9290aac59 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/weldutils.hxx>
 #include <tools/urlobj.hxx>
 #include <bitmaps.hlst>
+#include <comphelper/lok.hxx>
 
 using namespace css;
 using namespace css::uno;
@@ -388,7 +389,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, weld::ComboBox&, void)
             GraphicObject aBitmap;
             if(nPos == static_cast< sal_Int32 >(BITMAP))
             {
-                mxBmpImport->show();
+                if (!comphelper::LibreOfficeKit::isActive())
+                    mxBmpImport->show();
                 const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
                 if(pItem)
                 {
@@ -1235,7 +1237,8 @@ void AreaPropertyPanelBase::Update()
                 {
                     if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
                     {
-                        mxBmpImport->show();
+                        if (!comphelper::LibreOfficeKit::isActive())
+                            mxBmpImport->show();
                         mxLbFillType->set_active(sal_uInt32(BITMAP));
                         SvxFillAttrBox::Fill(*mxLbFillAttr, pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());