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

[Szymon KÅ‚os (via logerrit)]

 sw/source/ui/table/instable.cxx       |    5 +++++
 sw/source/uibase/inc/instable.hxx     |    1 +
 sw/uiconfig/swriter/ui/inserttable.ui |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7b3959b848e8bfc592903c5f69d16afee762cd44
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu May 21 16:33:32 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri May 22 09:30:28 2020 +0200

    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 at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index b960dcb4f168..a50cadb6bb18 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 c0194403ab98..c4980054f200 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -62,6 +62,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 7ce4f860fcce..236232a9cad2 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -373,7 +373,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>