diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-21 16:33:32 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-22 10:29:02 +0200 |
| commit | d87d43c70861fc6c017b434b296f5177c2c86026 (patch) | |
| tree | da026bf61df7ed1360265063e393087ebe3faee5 | |
| parent | e5868f6542af3a1fd87791b2c0d2e8d4f455f831 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94657
Tested-by: Jenkins
| -rw-r--r-- | sw/source/ui/table/instable.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/inc/instable.hxx | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/inserttable.ui | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index d83c78641e46..3ca34f37b313 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -23,6 +23,7 @@ #include <swmodule.hxx> #include <sfx2/htmlmode.hxx> #include <viewopt.hxx> +#include <comphelper/lok.hxx> #define ROW_COL_PROD 16384 @@ -75,7 +76,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> |