include/svl/numformat.hxx | 3 +--
include/svtools/htmlout.hxx | 3 +--
include/tools/stream.hxx | 4 ++--
svl/source/numbers/zforlist.cxx | 7 +++----
svtools/source/svhtml/htmlout.cxx | 5 ++---
5 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 6e0ddf83cefe78b688fcca805ecfe55899432c56
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Apr 19 16:30:20 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Apr 20 12:14:50 2024 +0200
loplugin:constantparam
Change-Id: I4963987a63d82dfe086932307675f92deebb8883
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166316
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index f1dcd68b479b..92746e033e61 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -561,8 +561,7 @@ private:
// Generate additional formats provided by i18n
SVL_DLLPRIVATE void ImpGenerateAdditionalFormats(
sal_uInt32 CLOffset,
- css::uno::Reference<css::i18n::XNumberFormatCode> const&
rNumberFormatCode,
- bool bAfterChangingSystemCL);
+ css::uno::Reference<css::i18n::XNumberFormatCode> const&
rNumberFormatCode);
// Test whether format code already exists, then return index key,
// otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 8509a8890eca..d82807545167 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -73,8 +73,7 @@ struct HTMLOutFuncs
// the 3rd parameter is an array of HTMLOutEvents which is terminated
// by an entry that consists only of 0s
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const
SvxMacroTableDtor&,
- const HTMLOutEvent*, bool bOutStarBasic,
- OUString *pNonConvertableChars = nullptr );
+ const HTMLOutEvent*, bool bOutStarBasic );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 7ed695b81f88..4ce0aed03539 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -366,8 +366,8 @@ public:
eDestCharSet==RTL_TEXTENCODING_UNICODE, otherwise write a sequence of
Bytecodes converted to eDestCharSet. Write trailing zero, if bZero is
true. */
bool WriteUnicodeOrByteText(std::u16string_view rStr,
rtl_TextEncoding eDestCharSet, bool bZero = false);
- bool WriteUnicodeOrByteText(std::u16string_view rStr, bool
bZero = false)
- { return WriteUnicodeOrByteText(rStr, GetStreamCharSet(),
bZero); }
+ bool WriteUnicodeOrByteText(std::u16string_view rStr)
+ { return WriteUnicodeOrByteText(rStr, GetStreamCharSet(),
/*bZero*/false); }
/** Write a Unicode character if eDestCharSet==RTL_TEXTENCODING_UNICODE,
otherwise write as Bytecode converted to eDestCharSet.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 9ae40a7f7f94..54576eb1c230 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -616,7 +616,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType
eOldLanguage )
// append new system additional formats
css::uno::Reference< css::i18n::XNumberFormatCode > xNFC =
i18n::NumberFormatMapper::create( m_xContext );
- ImpGenerateAdditionalFormats( nCLOffset, xNFC, true );
+ ImpGenerateAdditionalFormats( nCLOffset, xNFC );
}
const css::uno::Reference<css::uno::XComponentContext>&
SvNumberFormatter::GetComponentContext() const
@@ -3453,10 +3453,9 @@ void
SvNFFormatData::ImpGenerateAdditionalFormats(SvNFLanguageData& rCurrentLang
}
void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
- css::uno::Reference< css::i18n::XNumberFormatCode > const &
rNumberFormatCode,
- bool bAfterChangingSystemCL )
+ css::uno::Reference< css::i18n::XNumberFormatCode > const &
rNumberFormatCode )
{
- m_aFormatData.ImpGenerateAdditionalFormats(m_aCurrentLanguage,
GetNatNum(), CLOffset, rNumberFormatCode, bAfterChangingSystemCL);
+ m_aFormatData.ImpGenerateAdditionalFormats(m_aCurrentLanguage,
GetNatNum(), CLOffset, rNumberFormatCode, /*bAfterChangingSystemCL*/true);
}
namespace {
diff --git a/svtools/source/svhtml/htmlout.cxx
b/svtools/source/svhtml/htmlout.cxx
index 5dd6b099ec9f..956546269708 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -880,8 +880,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
const SvxMacroTableDtor& rMacroTable,
const HTMLOutEvent *pEventTable,
- bool bOutStarBasic,
- OUString *pNonConvertableChars )
+ bool bOutStarBasic )
{
sal_uInt16 i=0;
while( pEventTable[i].pBasicName || pEventTable[i].pJavaName )
@@ -901,7 +900,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
OString sOut = OString::Concat(" ") + pStr + "=\"";
rStrm.WriteOString( sOut );
- Out_String( rStrm, pMacro->GetMacName(), pNonConvertableChars
).WriteChar( '\"' );
+ Out_String( rStrm, pMacro->GetMacName(),
/*pNonConvertableChars*/nullptr ).WriteChar( '\"' );
}
}
i++;
