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

[Szymon KÅ‚os (via logerrit)]

 cui/source/customize/cfgutil.cxx       |    3 ++-
 cui/source/inc/cfgutil.hxx             |    1 +
 cui/uiconfig/ui/macroselectordialog.ui |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 295c8262f7e7e0436301deed5edde9963b19dd11
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 11 12:33:52 2021 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Mar 11 13:28:06 2021 +0100

    Remove description from mobile macro selector
    
    Change-Id: I76d9a73c65d0c7759b56a3d7b69aadf5b58d7da1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112327
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index fa9d9139d1f5..24fec3396858 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1060,6 +1060,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
     , m_xOKButton(m_xBuilder->weld_button("ok"))
     , m_xCancelButton(m_xBuilder->weld_button("cancel"))
     , m_xDescriptionText(m_xBuilder->weld_text_view("description"))
+    , m_xDescriptionFrame(m_xBuilder->weld_frame("descriptionframe"))
 {
     m_xCancelButton->show();
     m_xDialogDescription->show();
@@ -1096,7 +1097,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
     UpdateUI();
 
     if (comphelper::LibreOfficeKit::isActive())
-        m_xDescriptionText->hide();
+        m_xDescriptionFrame->hide();
 }
 
 SvxScriptSelectorDialog::~SvxScriptSelectorDialog()
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 885ccd8df8e7..20da0fc6f4a6 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -243,6 +243,7 @@ class SvxScriptSelectorDialog : public weld::GenericDialogController
     std::unique_ptr<weld::Button> m_xOKButton;
     std::unique_ptr<weld::Button> m_xCancelButton;
     std::unique_ptr<weld::TextView> m_xDescriptionText;
+    std::unique_ptr<weld::Frame> m_xDescriptionFrame;
 
     DECL_LINK(ClickHdl, weld::Button&, void);
     DECL_LINK(SelectHdl, weld::TreeView&, void);
diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui
index 4e65088cf94f..6b190e8cbde5 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -274,7 +274,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="descriptionframe">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>