sc/source/ui/condformat/condformatdlgentry.cxx | 7 +++++-- vcl/jsdialog/enabled.cxx | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-)
New commits: commit 84e7ebba0c8af520144b1439dfc4955b49b08559 Author: Parth Raiyani <[email protected]> AuthorDate: Wed Feb 11 17:44:11 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Feb 19 10:53:39 2026 +0100 jsdialog: enable conditional format dialogs - disable name reassignment used for uitests in LOK Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I35bc6e56ae8ef9bca126c7122b2a60f1392e8872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199175 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index d534227d197b..672b3a2a5277 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -87,8 +87,11 @@ void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) OUString sLabel = maStrCondition + OUString::number(nIndex); mxFtCondNr->set_label(sLabel); - // tdf#124412: uitest - mxFtCondition->set_buildable_name(sLabel); + if (!comphelper::LibreOfficeKit::isActive()) + { + // tdf#124412: uitest + mxFtCondition->set_buildable_name(sLabel); + } } void ScCondFrmtEntry::Select() diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7a134b2c005e..59c78593e484 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -155,9 +155,13 @@ constexpr auto ScalcDialogList { u"modules/scalc/ui/chisquaretestdialog.ui" }, { u"modules/scalc/ui/colwidthdialog.ui" }, { u"modules/scalc/ui/conditionaleasydialog.ui" }, + { u"modules/scalc/ui/conditionalentry.ui" }, + { u"modules/scalc/ui/conditionalformatdialog.ui" }, + { u"modules/scalc/ui/conditionaliconset.ui" }, { u"modules/scalc/ui/condformatmanager.ui" }, { u"modules/scalc/ui/correlationdialog.ui" }, { u"modules/scalc/ui/covariancedialog.ui" }, + { u"modules/scalc/ui/databaroptions.ui" }, { u"modules/scalc/ui/datafielddialog.ui" }, { u"modules/scalc/ui/datafieldoptionsdialog.ui" }, { u"modules/scalc/ui/definename.ui" },
