diff options
| author | gokaysatir <gokaysatir@collabora.com> | 2020-08-08 16:27:48 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-09-02 08:11:14 +0200 |
| commit | 5aba7d0bc54a03247fbd5e6514f79fff846f527c (patch) | |
| tree | 4c8cf221fbd821611e86501039747659a36c005f /svx/source/sidebar | |
| parent | 4a96b2b7787900b6ca45e772daa0fc284b3a4e0f (diff) | |
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@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@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@collabora.com>
Diffstat (limited to 'svx/source/sidebar')
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
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()); |