include/svl/numformat.hxx | 2 +- sc/source/core/data/queryevaluator.cxx | 2 +- svl/source/numbers/zforlist.cxx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 7850badb2e7adcfc712a92f4b0b0096426f169c1 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Wed Mar 13 11:53:54 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Mar 13 15:44:15 2024 +0100 ImpIsEntry can be const Change-Id: Id229344a68925a1bde84f2b4aad46cfc5f01b797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164769 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx index 681bb678eb53..bca75cfebef9 100644 --- a/include/svl/numformat.hxx +++ b/include/svl/numformat.hxx @@ -627,7 +627,7 @@ private: // Test whether format code already exists, then return index key, // otherwise NUMBERFORMAT_ENTRY_NOT_FOUND SVL_DLLPRIVATE sal_uInt32 ImpIsEntry(std::u16string_view rString, sal_uInt32 CLOffset, - LanguageType eLnge); + LanguageType eLnge) const; // Create builtin formats for language/country if necessary, return CLOffset SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL(LanguageType eLnge); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 9bea00f42cfe..e49fefae070b 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -996,7 +996,7 @@ sal_uInt32 SvNumberFormatter::ImpGetCLOffset(LanguageType eLnge) const sal_uInt32 SvNumberFormatter::ImpIsEntry(std::u16string_view rString, sal_uInt32 nCLOffset, - LanguageType eLnge) + LanguageType eLnge) const { sal_uInt32 res = NUMBERFORMAT_ENTRY_NOT_FOUND; auto it = aFTable.find( nCLOffset); @@ -1015,7 +1015,6 @@ sal_uInt32 SvNumberFormatter::ImpIsEntry(std::u16string_view rString, return res; } - SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable( SvNumFormatType& eType, sal_uInt32& FIndex, commit 0fdd4a6d33a074a4cd5c1ca6bed7fff2663b69d2 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Tue Mar 12 20:38:35 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Mar 13 15:44:07 2024 +0100 this formatter can be const Change-Id: I2cd83140585e0b7027bb1c165a8d59e51cbbaad0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164728 Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/sc/source/core/data/queryevaluator.cxx b/sc/source/core/data/queryevaluator.cxx index a8a08d9edfd9..174e1e0989c7 100644 --- a/sc/source/core/data/queryevaluator.cxx +++ b/sc/source/core/data/queryevaluator.cxx @@ -244,7 +244,7 @@ std::pair<bool, bool> ScQueryEvaluator::compareByValue(const ScRefCellValue& rCe nNumFmt = getNumFmt(nCol, nRow); if (nNumFmt) { - SvNumberFormatter* pFormatter + const SvNumberFormatter* pFormatter = mpContext ? mpContext->GetFormatTable() : mrDoc.GetFormatTable(); const SvNumberformat* pEntry = pFormatter->GetEntry(nNumFmt); if (pEntry)