From 5d40ced9e8b0aa1e4c07aea56ed8c1bdaa89705f Mon Sep 17 00:00:00 2001 From: "Juan C. Sanz" Date: Thu, 8 Sep 2022 00:14:39 +0200 Subject: Revert "tdf#150569 Modify hardcoded dates to extend the range of accepted dates" This reverts commit b20594f2fc8f6f9fdbf0b257b4e74d95a8d90139. Reason for revert: Further testing has shown some errors in other ways of displaying the data Change-Id: Ic4909f8571c8730ab3ba622c7fad99f2646616ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139566 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/source/controls/unocontrolmodel.cxx | 4 ++-- toolkit/source/controls/unocontrols.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index efd25aa998e7..986f55efbc50 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -226,8 +226,8 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_PUSHBUTTONTYPE: aDefault <<= sal_Int16(0) /*PushButtonType::STANDARD*/; break; case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= sal_Int16(awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY); break; - case BASEPROPERTY_DATEMAX: aDefault <<= util::Date( 31, 12, 9999 ); break; - case BASEPROPERTY_DATEMIN: aDefault <<= util::Date( 1, 1, 0001 ); break; + case BASEPROPERTY_DATEMAX: aDefault <<= util::Date( 31, 12, 2200 ); break; + case BASEPROPERTY_DATEMIN: aDefault <<= util::Date( 1, 1, 1900 ); break; case BASEPROPERTY_TIMEMAX: aDefault <<= util::Time(0, 0, 59, 23, false); break; case BASEPROPERTY_TIMEMIN: aDefault <<= util::Time(); break; case BASEPROPERTY_VALUEMAX_DOUBLE: aDefault <<= double(1000000); break; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index de764e7b8be1..3bc095cf3f03 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -3433,8 +3433,8 @@ stardiv_Toolkit_UnoControlDateFieldModel_get_implementation( UnoDateFieldControl::UnoDateFieldControl() { - mnFirst = util::Date( 1, 1, 0001 ); - mnLast = util::Date( 31, 12, 9999 ); + mnFirst = util::Date( 1, 1, 1900 ); + mnLast = util::Date( 31, 12, 2200 ); mbLongFormat = TRISTATE_INDET; } -- cgit