[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - extensions/source

[Caolán McNamara (via logerrit)]

 extensions/source/propctrlr/standardcontrol.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 998005696249053b86730efaed220eb52711e688
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 16 15:53:00 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Mon Aug 16 12:07:22 2021 +0200

    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 at redhat.com>
    (cherry picked from commit ecf901685ac0c6c7b27b81096bea96cdc3d2c2ca)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120430
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 26219f8a79af..ef2645a635a1 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);
         }
     }