summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2021-03-11 12:33:52 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2021-04-16 16:06:36 +0200
commit8a994d8f8246b913143c1062f970e045d9105c61 (patch)
tree9dd7e4eaf8ba723f2a2fcf73af9f8cfbda3b2a1f
parentrelated tdf#137626: rewrite XML_min to XML_minute (diff)
downloadcore-8a994d8f8246b913143c1062f970e045d9105c61.tar.gz
core-8a994d8f8246b913143c1062f970e045d9105c61.zip
Remove description from mobile macro selector
Change-Id: I76d9a73c65d0c7759b56a3d7b69aadf5b58d7da1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112327 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114206 Tested-by: Jenkins
-rw-r--r--cui/source/customize/cfgutil.cxx3
-rw-r--r--cui/source/inc/cfgutil.hxx1
-rw-r--r--cui/uiconfig/ui/macroselectordialog.ui2
3 files changed, 4 insertions, 2 deletions
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>