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

[Szymon KÅ‚os (via logerrit)]

 sw/source/uibase/sidebar/TableEditPanel.cxx |    6 ++++++
 sw/source/uibase/sidebar/TableEditPanel.hxx |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 17d06055d213e907b966081690d5977a91ae69f7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Sep 7 09:40:29 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 7 10:33:09 2020 +0200

    Hide InsertFormula in Writer online
    
    Change-Id: I5875559b46d242434b8e47f214e7f7f7a4a3db6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102146
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index a657feb8718c..a57311c5cf40 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -19,6 +19,7 @@
 #include <swmodule.hxx>
 #include <usrpref.hxx>
 #include <svx/svxids.hrc>
+#include <comphelper/lok.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
@@ -116,6 +117,10 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
 {
     get(m_pRowHeightEdit, "rowheight");
     get(m_pColumnWidthEdit, "columnwidth");
+    get(m_pMiscToolbar, "misc");
+
+    if (comphelper::LibreOfficeKit::isActive())
+        m_pMiscToolbar->HideItem(m_pMiscToolbar->GetItemId(".uno:InsertFormula"));
 
     InitRowHeightToolitem();
     InitColumnWidthToolitem();
@@ -151,6 +156,7 @@ void TableEditPanel::dispose()
 {
     m_pRowHeightEdit.clear();
     m_pColumnWidthEdit.clear();
+    m_pMiscToolbar.clear();
     m_aRowHeightController.dispose();
     m_aColumnWidthController.dispose();
     m_aInsertRowsBeforeController.dispose();
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index 13ae11b5dd99..4088d0a7a433 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -15,6 +15,7 @@
 #include <svx/sidebar/PanelLayout.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <svx/relfld.hxx>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
 
 namespace sw
 {
@@ -49,6 +50,7 @@ private:
 
     VclPtr<SvxRelativeField> m_pRowHeightEdit;
     VclPtr<SvxRelativeField> m_pColumnWidthEdit;
+    VclPtr<::sfx2::sidebar::SidebarToolBox> m_pMiscToolbar;
     ::sfx2::sidebar::ControllerItem m_aRowHeightController;
     ::sfx2::sidebar::ControllerItem m_aColumnWidthController;
     ::sfx2::sidebar::ControllerItem m_aInsertRowsBeforeController;