loplugin:constantparam
Change-Id: I4963987a63d82dfe086932307675f92deebb8883 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166316 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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++;
|
||||
|
||||
Reference in New Issue
Block a user