bin/find-can-be-private-symbols.functions.results | 1 -
include/svl/numformat.hxx | 4 ----
svl/source/numbers/zforlist.cxx | 6 +++++-
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 992ec11cf73003d326ce7610a481c6bd19564588
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Mar 20 17:22:46 2024 +0000
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Apr 15 05:55:03 2024 +0200
Related: tdf#160056 this can be be a local function
Change-Id: I0ffebd5a1f871b86507d0c1b3946b32993d76365
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165106
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit e8d01d2447b3350f1bd24e07580402c4c699756c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165747
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/bin/find-can-be-private-symbols.functions.results
b/bin/find-can-be-private-symbols.functions.results
index 02cd245cbb54..99326b6aeede 100644
--- a/bin/find-can-be-private-symbols.functions.results
+++ b/bin/find-can-be-private-symbols.functions.results
@@ -9405,7 +9405,6 @@ SvNumberFormatter::GetTimeFormat(double,
o3tl::strong_int<unsigned short, Langua
SvNumberFormatter::GetTransliteration() const
SvNumberFormatter::GetUserDefColor(unsigned short)
SvNumberFormatter::ImpLookupCurrencyEntryLoopBody(NfCurrencyEntry const*&,
bool&, NfCurrencyEntry const*, unsigned short, std::basic_string_view<char16_t,
std::char_traits<char16_t> >)
-SvNumberFormatter::ImpPosToken(rtl::OUStringBuffer const&, char16_t, int) const
SvNumberFormatter::ImpSubstituteEntry(SvNumberformat*, unsigned int*)
SvNumberFormatter::InvalidateDateAcceptancePatterns()
SvNumberFormatter::IsDecimalSep(std::basic_string_view<char16_t,
std::char_traits<char16_t> >) const
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index 8a6c55b7fd9e..2a9c52ce33c2 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -676,10 +676,6 @@ private:
// link to be set at
<method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
DECL_DLLPRIVATE_STATIC_LINK(SvNumberFormatter, CurrencyChangeLink,
LinkParamNone*, void);
- // return position of a special character
- sal_Int32 ImpPosToken(const OUStringBuffer& sFormat, sal_Unicode token,
- sal_Int32 nStartPos = 0) const;
-
// Substitute a format during GetFormatEntry(), i.e. system formats.
SvNumberformat* ImpSubstituteEntry(SvNumberformat* pFormat, sal_uInt32*
o_pRealKey = nullptr);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7251692ca7d0..1597f8b244e0 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3109,8 +3109,10 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats(
sal_uInt32 CLOffset,
pStdFormat->SetLastInsertKey( static_cast<sal_uInt16>(nPos - CLOffset),
SvNumberformat::FormatterPrivateAccess() );
}
+namespace {
-sal_Int32 SvNumberFormatter::ImpPosToken ( const OUStringBuffer & sFormat,
sal_Unicode token, sal_Int32 nStartPos /* = 0*/ ) const
+// return position of a special character
+sal_Int32 ImpPosToken(const OUStringBuffer & sFormat, sal_Unicode token,
sal_Int32 nStartPos = 0)
{
sal_Int32 nLength = sFormat.getLength();
for ( sal_Int32 i=nStartPos; i<nLength && i>=0 ; i++ )
@@ -3143,6 +3145,8 @@ sal_Int32 SvNumberFormatter::ImpPosToken ( const
OUStringBuffer & sFormat, sal_U
return -2;
}
+}
+
OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
LanguageType eLnge,
bool bThousand,
