connectivity/source/commontools/dbconversion.cxx | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
New commits:
commit da3dd48eaf9086f8ab28d6a6655f9a638e51433a
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Tue Dec 6 22:37:19 2022 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Dec 6 22:38:12 2022 +0000
Resolves: tdf#152381 Treat 0-0-0 invalid date as 0 relative days
Change-Id: I70cf18395e26ababa854299a58f8839f5bdf8e2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143748
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index 26ef95b96b64..fed51204afb7 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -151,6 +151,22 @@ namespace dbtools
static sal_Int32 implRelativeToAbsoluteNull(const css::util::Date& _rDate)
{
+ if (_rDate.Day == 0 && _rDate.Month == 0 && _rDate.Year == 0)
+ {
+ // 0000-00-00 is *NOT* a valid date and passing it to the date
+ // conversion even when normalizing rightly asserts. Whatever we
+ // return here, it will be wrong. The old before commit
+ // 52ff16771ac160d27fd7beb78a4cfba22ad84f06 wrong implementation
+ // calculated -365 for that, effectively that would be a date of
+ // -0001-01-01 now but it was likely assumed that would be
+ // 0000-00-01 or even 0000-00-00 instead. Try if we get away with 0
+ // for -0001-12-31, the same that
+ // comphelper::date::convertDateToDaysNormalizing()
+ // would return if comphelper::date::normalize() wouldn't ignore
+ // such "empty" date.
+
+ return 0;
+ }
return comphelper::date::convertDateToDaysNormalizing( _rDate.Day,
_rDate.Month, _rDate.Year);
}
