diff options
author | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2021-11-29 17:18:02 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-14 18:10:51 +0100 |
commit | 968437cc61cc45ea3e15cabf2c3f67360c243173 (patch) | |
tree | 2f540776cbca80510dcbb972a3fdd9ecbeda83d6 /sc/source/ui | |
parent | be9211c22d354c489f29f459c22201532aef8da5 (diff) |
tdf#124412 - Set actual condition for an inactive date entry
In the conditional format screen, set the actual condition for an
inactive date entry instead of "Date is today" in all cases.
Change-Id: I3d3f05c35a9830a1e82d68521e80e88c99b43a90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126059
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
(cherry picked from commit dfdf33a34729de7f256ed396be93fb96b4844404)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126238
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 319ca367b204..9fde12a53cda 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1287,7 +1287,8 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const OUString ScDateFrmtEntry::GetExpressionString() { - return ScCondFormatHelper::GetExpression(DATE, 0); + // tdf#124412 - set actual condition for an inactive date entry + return ScCondFormatHelper::GetExpression(DATE, mxLbDateEntry->get_active()); } IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, weld::ComboBox&, void ) |