summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrash419 <rashesh.padia@collabora.com>2022-06-15 17:23:44 +0530
committerSzymon Kłos <szymon.klos@collabora.com>2022-11-20 10:40:33 +0100
commit67160035d65f9b43b8483e5900d2a2812e1bbecc (patch)
treed72f60480f4c524ab4c1eb2656401f1bf339b525
parentba5e0013e74f072300e808e4d8d679b6f42bff92 (diff)
sw: jsdialog: enable contentcontrol and contentcontrollistitem dialogs
contentcontrol: fix: modify, remove, move up/down buttons doesnot work even if item is selected in jsdialog Signed-off-by: rash419 <rashesh.padia@collabora.com> Change-Id: Ib038ce2a3ff6f92ab7314b18f36a038991a35f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135902 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142971 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r--sw/source/ui/misc/contentcontroldlg.cxx5
-rw-r--r--vcl/jsdialog/enabled.cxx4
2 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx
index ec45e87066c4..799f722945ff 100644
--- a/sw/source/ui/misc/contentcontroldlg.cxx
+++ b/sw/source/ui/misc/contentcontroldlg.cxx
@@ -400,11 +400,6 @@ IMPL_LINK_NOARG(SwContentControlDlg, MoveDownHdl, weld::Button&, void)
IMPL_LINK_NOARG(SwContentControlDlg, SelectionChangedHdl, weld::TreeView&, void)
{
- if (!m_xListItems->has_focus())
- {
- return;
- }
-
int nRow = m_xListItems->get_selected_index();
if (nRow < 0)
{
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6ba2adc8b1fc..efb87ac0b9fe 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -61,7 +61,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile)
|| rUIFile == u"xmlsec/ui/certpage.ui" || rUIFile == u"svx/ui/accessibilitycheckdialog.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
|| rUIFile == u"svx/ui/accessibilitycheckentry.ui"
- || rUIFile == u"cui/ui/widgettestdialog.ui")
+ || rUIFile == u"cui/ui/widgettestdialog.ui"
+ || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
+ || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui")
{
return true;
}