svl/source/numbers/zforfind.cxx | 2 +- svl/source/numbers/zformat.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 02fc35d879dda6e9c48c89fbb09fe1c618d6673b Author: Eike Rathke <[email protected]> AuthorDate: Wed Jun 21 10:57:52 2023 +0200 Commit: Eike Rathke <[email protected]> CommitDate: Wed Jun 21 13:15:16 2023 +0200 svl: Use DateTime::Sub() instead of operator-() Change-Id: I036798013404df4bcfb988d4f231fcf30cec3162 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153382 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index da993232e677..b99f32c1e5b2 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2265,7 +2265,7 @@ input for the following reasons: if ( res && pCal->isValid() ) { - double fDiff = DateTime(*moNullDate) - pCal->getEpochStart(); + double fDiff = DateTime::Sub( DateTime(*moNullDate), pCal->getEpochStart()); fDays = ::rtl::math::approxFloor( pCal->getLocalDateTime() ); fDays -= fDiff; nTryOrder = nFormatOrder; // break for diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 5128c5cca118..62bd7957d635 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3228,7 +3228,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, case NF_KEY_AMPM: // AM/PM if ( !bCalendarSet ) { - double fDiff = DateTime(rScan.GetNullDate()) - GetCal().getEpochStart(); + double fDiff = DateTime::Sub( DateTime(rScan.GetNullDate()), GetCal().getEpochStart()); fDiff += fNumberOrig; GetCal().setLocalDateTime( fDiff ); bCalendarSet = true; @@ -3688,13 +3688,13 @@ static bool lcl_getValidDate( const DateTime& rNullDate, const DateTime& rEpochS static const DateTime aCE( Date(1,1,1)); static const DateTime aMin( Date(1,1, SAL_MIN_INT16)); static const DateTime aMax( Date(31,12, SAL_MAX_INT16), tools::Time(23,59,59, tools::Time::nanoSecPerSec - 1)); - static const double fMin = aMin - aCE; - static const double fMax = aMax - aCE; + static const double fMin = DateTime::Sub( aMin, aCE); + static const double fMax = DateTime::Sub( aMax, aCE); // Value must be representable in our tools::Date proleptic Gregorian // calendar as well. - const double fOff = (rNullDate - aCE) + fNumber; + const double fOff = DateTime::Sub( rNullDate, aCE) + fNumber; // Add diff between epochs to serial date number. - const double fDiff = rNullDate - rEpochStart; + const double fDiff = DateTime::Sub( rNullDate, rEpochStart); fNumber += fDiff; return fMin <= fOff && fOff <= fMax; }
