summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-05-21 16:33:32 +0200
committerSzymon Kłos <eszkadev@gmail.com>2020-05-22 09:41:33 +0200
commit0fe4f3590e641ebd3049bdfe72cc32fbc74603ee (patch)
tree33fe6a123f05ca5dace1d5fb7f174f7b40bceb36
parent5d0833abeb3637f826fd8c3a047d3c6a6b87f98d (diff)
Don't show styles frame in insert table in online
Change-Id: I2ee2daef028b49a409920c0fe83190575e7a82c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94639 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r--sw/source/ui/table/instable.cxx5
-rw-r--r--sw/source/uibase/inc/instable.hxx1
-rw-r--r--sw/uiconfig/swriter/ui/inserttable.ui2
3 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 4d1225af9a27..5401b92c0bda 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -24,6 +24,7 @@
#include <sfx2/htmlmode.hxx>
#include <viewopt.hxx>
#include <swabstdlg.hxx>
+#include <comphelper/lok.hxx>
#define ROW_COL_PROD 16384
@@ -76,7 +77,11 @@ SwInsTableDlg::SwInsTableDlg(SwView& rView)
, m_xInsertBtn(m_xBuilder->weld_button("ok"))
, m_xLbFormat(m_xBuilder->weld_tree_view("formatlbinstable"))
, m_xWndPreview(new weld::CustomWeld(*m_xBuilder, "previewinstable", m_aWndPreview))
+ , m_xStyleFrame(m_xBuilder->weld_frame("stylesframe"))
{
+ if (comphelper::LibreOfficeKit::isActive())
+ m_xStyleFrame->hide();
+
const int nWidth = m_xLbFormat->get_approximate_digit_width() * 32;
const int nHeight = m_xLbFormat->get_height_rows(8);
m_xLbFormat->set_size_request(nWidth, nHeight);
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index 3145227e84a1..aa36dc655c00 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -58,6 +58,7 @@ class SwInsTableDlg : public SfxDialogController
std::unique_ptr<weld::Button> m_xInsertBtn;
std::unique_ptr<weld::TreeView> m_xLbFormat;
std::unique_ptr<weld::CustomWeld> m_xWndPreview;
+ std::unique_ptr<weld::Frame> m_xStyleFrame;
// Returns 255 if mapping is not possible.
// This means there cannot be more than 255 autotable style.
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index 03a2eb096a91..64cfab916932 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -366,7 +366,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="stylesframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>