sw/source/ui/misc/contentcontroldlg.cxx | 5 ----- vcl/jsdialog/enabled.cxx | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-)
New commits: commit 8c53583faa493abf6cd7b2e56b5df7343e922133 Author: rash419 <[email protected]> AuthorDate: Wed Jun 15 17:23:44 2022 +0530 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Jun 16 15:02:13 2022 +0200 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 <[email protected]> Change-Id: Ib038ce2a3ff6f92ab7314b18f36a038991a35f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135902 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx index 95c86120e497..5e4347e62afb 100644 --- a/sw/source/ui/misc/contentcontroldlg.cxx +++ b/sw/source/ui/misc/contentcontroldlg.cxx @@ -374,11 +374,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 f7849bb9e3e4..7984dab3d6f8 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -58,7 +58,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"xmlsec/ui/viewcertdialog.ui" || rUIFile == u"xmlsec/ui/certgeneral.ui" || rUIFile == u"xmlsec/ui/certpage.ui" || rUIFile == u"svx/ui/accessibilitycheckdialog.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; }
