sc/source/ui/condformat/condformatdlgentry.cxx | 7 +++++-- svx/source/tbxctrls/SvxColorIconView.cxx | 6 ++++++ vcl/jsdialog/enabled.cxx | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 1dd74a8af7b333d1ee57e5313fc8f5d7d7baa328 Author: Parth Raiyani <[email protected]> AuthorDate: Wed Feb 11 17:44:11 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 09:14:44 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]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200530 diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 4f4e39cc633c..e4e1f421706f 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -92,8 +92,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" }, commit 8ca9484944a3a93a5f3b3aba08bbbba540ad7c8d Author: Henry Castro <[email protected]> AuthorDate: Tue Feb 17 13:43:37 2026 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 09:14:36 2026 +0100 lok: change default size for entry color icon view The width and height of the color picker entry are defined by the listBoxPreviewDefaultLogicWidth and listBoxPreviewDefaultLogicHeight properties. However, in the LOK case, it is necessary to change them to 24×24 to meet accessibility requirements and to avoid any conflict with the default listbox preview size. Change-Id: Id5591aff38ef2054a3c8057db2291823c7e990ba Signed-off-by: Henry Castro <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199567 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200529 diff --git a/svx/source/tbxctrls/SvxColorIconView.cxx b/svx/source/tbxctrls/SvxColorIconView.cxx index 6c95bd58fbf1..a1ee080af3dd 100644 --- a/svx/source/tbxctrls/SvxColorIconView.cxx +++ b/svx/source/tbxctrls/SvxColorIconView.cxx @@ -24,9 +24,15 @@ #include <vcl/virdev.hxx> #include <vcl/bitmap.hxx> #include <osl/diagnose.h> +#include <comphelper/lok.hxx> sal_uInt32 SvxColorIconView::getEntryEdgeLength() { + if (comphelper::LibreOfficeKit::isActive()) + { + return 26; + } + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); return rStyleSettings.GetListBoxPreviewDefaultPixelSize().Height() + 1; }
