[Libreoffice-commits] core.git: 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 8a994d8f8246b913143c1062f970e045d9105c61
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: Fri Apr 16 16:06:36 2021 +0200

    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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114206
    Tested-by: Jenkins

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 84540dd8d7f6..5ac0eda55edb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1081,6 +1081,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();
@@ -1118,7 +1119,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 0d6a8c1ee4be..0b9e5a439d65 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -242,6 +242,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 5403437ab8f6..4b502ddfaa96 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -262,7 +262,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>