svl/source/numbers/zforfind.cxx | 6 +++---
svl/source/numbers/zforfind.hxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 53dd76d891c9d7f3d62ed749f873f95a4915e3e3
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Apr 30 16:45:05 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Apr 30 20:56:07 2025 +0200
moNullDate is always created
Change-Id: Id567d4efef40d7510d28d2e02e954d9ab948f121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184841
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6d197c9488d1..cb9c238f51f1 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -75,13 +75,13 @@ const bool kDefaultEra = true; // Gregorian CE,
positive year
ImpSvNumberInputScan::ImpSvNumberInputScan(SvNFLanguageData& rCurrentLanguage)
:
mrCurrentLanguageData(rCurrentLanguage),
+ maNullDate( 30,12,1899 ),
bTextInitialized( false ),
bScanGenitiveMonths( false ),
bScanPartitiveMonths( false ),
eScannedType( SvNumFormatType::UNDEFINED ),
eSetType( SvNumFormatType::UNDEFINED )
{
- moNullDate.emplace( 30,12,1899 );
nYear2000 = SvNumberFormatter::GetYear2000Default();
Reset();
ChangeIntl();
@@ -2274,7 +2274,7 @@ input for the following reasons:
if ( res && pCal->isValid() )
{
- double fDiff = DateTime::Sub( DateTime(*moNullDate),
pCal->getEpochStart());
+ double fDiff = DateTime::Sub( DateTime(maNullDate),
pCal->getEpochStart());
fDays = ::rtl::math::approxFloor( pCal->getLocalDateTime() );
fDays -= fDiff;
nTryOrder = nFormatOrder; // break for
@@ -3858,7 +3858,7 @@ void ImpSvNumberInputScan::ChangeNullDate( const
sal_uInt16 Day,
const sal_uInt16 Month,
const sal_Int16 Year )
{
- moNullDate = Date(Day, Month, Year);
+ maNullDate = Date(Day, Month, Year);
}
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 8765697cb5f9..d342265a221c 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -88,10 +88,10 @@ private:
std::unique_ptr<OUString[]> pUpperDayText; //* Array of
day of week names, uppercase
std::unique_ptr<OUString[]> pUpperAbbrevDayText; //* Array of
day of week names, abbreviated, uppercase
OUString aUpperCurrSymbol; //* Currency symbol, uppercase
+ Date maNullDate; //* 30Dec1899
bool bTextInitialized; //* Whether days and months
are initialized
bool bScanGenitiveMonths; //* Whether to scan an input
for genitive months
bool bScanPartitiveMonths; //* Whether to scan an input
for partitive months
- std::optional<Date> moNullDate; //* 30Dec1899
// Variables for provisional results:
OUString sStrArray[SV_MAX_COUNT_INPUT_STRINGS];//* Array of scanned
substrings
bool IsNum[SV_MAX_COUNT_INPUT_STRINGS]; //* Whether a substring
is numeric
