diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-07-16 15:53:00 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-08-16 12:07:49 +0200 |
| commit | dbdf6fa77fd350b53ef3b1b78eb9db244e608c72 (patch) | |
| tree | 890dc36310a1763759a564d8e336e3c29808f5b8 /extensions | |
| parent | tdf#126961 link to macOS address book - crashes and restarts (diff) | |
| download | core-dbdf6fa77fd350b53ef3b1b78eb9db244e608c72.tar.gz core-dbdf6fa77fd350b53ef3b1b78eb9db244e608c72.zip | |
Related: tdf#143357 set blank label for no date
instead of current system date
Change-Id: Ic504b34990a8ea5151ec653de2db860c1cd4b8ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119079
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ecf901685ac0c6c7b27b81096bea96cdc3d2c2ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120429
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 2307d0bf01f4..7cbca1c276b4 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -97,15 +97,18 @@ namespace pcr void SAL_CALL ODateControl::setValue( const Any& _rValue ) { + SvtCalendarBox* pCalendarBox = getTypedControlWindow(); + util::Date aUNODate; if ( !( _rValue >>= aUNODate ) ) { - getTypedControlWindow()->set_date(::Date(::Date::SYSTEM)); + pCalendarBox->set_date(::Date(::Date::SYSTEM)); + pCalendarBox->set_label(""); } else { ::Date aDate( aUNODate.Day, aUNODate.Month, aUNODate.Year ); - getTypedControlWindow()->set_date(aDate); + pCalendarBox->set_date(aDate); } } |