svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 93aed840d996af6a7189bd6d5a3c40ca8e9b5205
Author: gokaysatir <gokaysa...@collabora.com>
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Wed Aug 12 01:38:25 2020 +0200
core: Hide shape area bitmap import button.
Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100367
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index e22455ee2c5e..0e911e47b1e9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -37,6 +37,7 @@
#include <sfx2/opengrf.hxx>
#include <o3tl/make_unique.hxx>
#include <bitmaps.hlst>
+#include <comphelper/lok.hxx>
using namespace css;
using namespace css::uno;
@@ -377,7 +378,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl,
ListBox&, void)
GraphicObject aBitmap;
if(nPos == static_cast< sal_Int32 >(BITMAP))
{
- mpBmpImport->Show();
+ if (!comphelper::LibreOfficeKit::isActive())
+ mpBmpImport->Show();
const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
if(pItem)
{
@@ -1219,7 +1221,8 @@ void AreaPropertyPanelBase::Update()
{
if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
{
- mpBmpImport->Show();
+ if (!comphelper::LibreOfficeKit::isActive())
+ mpBmpImport->Show();
mpLbFillType->SelectEntryPos(sal_uInt32(BITMAP));
mpLbFillAttr->Fill(pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
