include/svl/numformat.hxx | 2 +-
include/svl/zformat.hxx | 8 ++++----
svl/source/numbers/zforlist.cxx | 2 +-
svl/source/numbers/zformat.cxx | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 07872404ccfc99324b81b17bb90f1dc624b234fb
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Mar 13 12:13:54 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Mar 13 21:41:19 2024 +0100
These methods can be const too
Change-Id: Iaef46216dac6584f57b7933d658384f54d0a4544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164772
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 9b584ad5877d..b4d7ddb0ac29 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -638,7 +638,7 @@ private:
sal_uInt16 j,
sal_uInt16 nIx,
sal_Int32 nDigCnt,
- bool bAddDecSep = true );
+ bool bAddDecSep = true ) const;
// Helper function to fill in the group (AKA thousand) separators
// or to skip additional digits
@@ -647,14 +647,14 @@ private:
sal_Int32& k,
sal_uInt16 nIx,
sal_Int32 & nDigitCount,
- utl::DigitGroupingIterator & );
+ utl::DigitGroupingIterator & ) const;
SVL_DLLPRIVATE bool ImpDecimalFill( OUStringBuffer& sStr,
double& rNumber,
sal_Int32 nDecPos,
sal_uInt16 j,
sal_uInt16 nIx,
- bool bInteger );
+ bool bInteger ) const;
/** Calculate each element of fraction:
* integer part, numerator part, denominator part
@@ -705,7 +705,7 @@ private:
SVL_DLLPRIVATE bool ImpGetNumberOutput( double fNumber,
sal_uInt16 nIx,
- OUStringBuffer& OutString );
+ OUStringBuffer& OutString ) const;
SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 3948c5f70206..062f86fe4c59 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4352,7 +4352,7 @@ bool SvNumberformat::ImpGetLogicalOutput(double fNumber,
bool SvNumberformat::ImpGetNumberOutput(double fNumber,
sal_uInt16 nIx,
- OUStringBuffer& sStr)
+ OUStringBuffer& sStr) const
{
bool bRes = false;
bool bSign;
@@ -4470,7 +4470,7 @@ bool SvNumberformat::ImpDecimalFill( OUStringBuffer&
sStr, // number string
sal_Int32 nDecPos, // decimals start
sal_uInt16 j, // symbol index
within format code
sal_uInt16 nIx, // subformat index
- bool bInteger) // is integer
+ bool bInteger) const // is integer
{
bool bRes = false;
bool bFilled = false; // Was filled?
@@ -4592,7 +4592,7 @@ bool SvNumberformat::ImpNumberFillWithThousands(
OUStringBuffer& sBuff, // numb
sal_uInt16 j, //
symbol index within format code
sal_uInt16 nIx, //
subformat index
sal_Int32 nDigCnt, //
count of integer digits in format
- bool bAddDecSep) // add
decimal separator if necessary
+ bool bAddDecSep) const // add
decimal separator if necessary
{
bool bRes = false;
sal_Int32 nLeadingStringChars = 0; // inserted StringChars before number
@@ -4752,7 +4752,7 @@ void SvNumberformat::ImpDigitFill(OUStringBuffer& sStr,
// number string
sal_Int32 & k, // position within
string
sal_uInt16 nIx, // subformat index
sal_Int32 & nDigitCount, // count of
integer digits from the right so far
- utl::DigitGroupingIterator & rGrouping ) //
current grouping
+ utl::DigitGroupingIterator & rGrouping )
const // current grouping
{
if (NumFor[nIx].Info().bThousand) // Only if grouping fill in separators
{
commit 848ed64cd5b63f07d11bf3754c522a731fa7ae88
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Mar 13 17:22:03 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Mar 13 21:41:09 2024 +0100
SvNumberFormatter::GetUserDefColor can be const
Change-Id: If499e28e5ac69018b35b475a73ecb2dc4b78dad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164786
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 bca75cfebef9..e28bd3a1af94 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -62,7 +62,7 @@ public:
/// Set CallBack to ColorTable
void SetColorLink(const Link<sal_uInt16, Color*>& rColorTableCallBack);
/// Do the CallBack to ColorTable
- Color* GetUserDefColor(sal_uInt16 nIndex);
+ Color* GetUserDefColor(sal_uInt16 nIndex) const;
/// Change language/country, also input and format scanner
void ChangeIntl(LanguageType eLnge);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index e49fefae070b..c7b5ce164e65 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -375,7 +375,7 @@ void SvNumberFormatter::SetColorLink( const
Link<sal_uInt16,Color*>& rColorTable
aColorLink = rColorTableCallBack;
}
-Color* SvNumberFormatter::GetUserDefColor(sal_uInt16 nIndex)
+Color* SvNumberFormatter::GetUserDefColor(sal_uInt16 nIndex) const
{
::osl::MutexGuard aGuard( GetInstanceMutex() );
if( aColorLink.IsSet() )
