mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Online: Hide shape area bitmap import button.

Browse Source 
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>
This commit is contained in:
gokaysatir 2020-08-08 16:27:48 +03:00 committed by Andras Timar
parent 4a96b2b778
commit 5aba7d0bc5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
View File

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