strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loplugin:constantparam

Browse source 
Change-Id: I8134744b6c1279c497d4763eddf614bb840f7f3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135602
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-06-10 15:58:28 +02:00
parent 3b5c926777
commit 95d91cd41e
11 changed files with 35 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sfx2/frmhtmlw.hxx
View file

@ -53,8 +53,7 @@ public:
OUString *pNonConvertableChars = nullptr );
static void Out_FrameDescriptor(
SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet,
OUString *pNonConvertableChars = nullptr );
SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet);
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,

6
include/svtools/htmlout.hxx
View file

@ -59,8 +59,7 @@ struct HTMLOutFuncs
bool bOutStarBasic,
const char *pDelim,
const char *pIndentArea,
const char *pIndentMap,
OUString *pNonConvertableChars = nullptr );
const char *pIndentMap );
SVT_DLLPUBLIC static SvStream& FlushToAscii( SvStream& );
SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm,
@ -70,8 +69,7 @@ struct HTMLOutFuncs
ScriptType eScriptType,
const OUString& rSrc,
const OUString *pSBLibrary,
const OUString *pSBModule,
OUString *pNonConvertableChars = nullptr );
const OUString *pSBModule );
// the 3rd parameter is an array of HTMLOutEvents which is terminated
// by an entry that consists only of 0s

8
include/svx/txencbox.hxx
View file

@ -36,11 +36,6 @@ public:
/** Fill with all known encodings but exclude those matching one or more
given flags as defined in rtl/tencinfo.h
<p> If nButIncludeInfoFlags is given, encodings are included even if they
match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and UTF8
with RTL_TEXTENCODING_INFO_MIME </p>
@param bExcludeImportSubsets
If <TRUE/>, some specific encodings are not listed, as they are a
subset of another encoding. This is the case for
@ -50,8 +45,7 @@ public:
<TRUE/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
bool bExcludeImportSubsets,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
sal_uInt32 nExcludeInfoFlags = 0
);
/** Fill with all encodings known to the dbtools::OCharsetMap but exclude

10
sc/inc/column.hxx
View file

@ -446,11 +446,11 @@ public:
{ return GetString( GetCellValue( rBlockPos, nRow ), nRow, pContext ); }
double* GetValueCell( SCROW nRow );
// Note that if pShared is set and a value is returned that way, the returned OUString is empty.
OUString GetInputString( SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const
{ return GetInputString( GetCellValue( nRow ), nRow, pShared, bForceSystemLocale ); }
OUString GetInputString( SCROW nRow, bool bForceSystemLocale = false ) const
{ return GetInputString( GetCellValue( nRow ), nRow, bForceSystemLocale ); }
OUString GetInputString( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow,
const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const
{ return GetInputString( GetCellValue( rBlockPos, nRow ), nRow, pShared, bForceSystemLocale ); }
bool bForceSystemLocale = false ) const
{ return GetInputString( GetCellValue( rBlockPos, nRow ), nRow, bForceSystemLocale ); }
double GetValue( SCROW nRow ) const;
const EditTextObject* GetEditText( SCROW nRow ) const;
void RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr );
@ -826,7 +826,7 @@ private:
SCROW FindNextVisibleRow(SCROW nRow, bool bForward) const;
OUString GetString( const ScRefCellValue& cell, SCROW nRow, const ScInterpreterContext* pContext = nullptr ) const;
OUString GetInputString( const ScRefCellValue& cell, SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const;
OUString GetInputString( const ScRefCellValue& cell, SCROW nRow, bool bForceSystemLocale = false ) const;
/**
* Called whenever the state of cell array gets modified i.e. new cell

2
sc/inc/table.hxx
View file

@ -452,7 +452,7 @@ public:
OUString GetString( SCCOL nCol, SCROW nRow, const ScInterpreterContext* pContext = nullptr ) const;
double* GetValueCell( SCCOL nCol, SCROW nRow );
// Note that if pShared is set and a value is returned that way, the returned OUString is empty.
OUString GetInputString( SCCOL nCol, SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const;
OUString GetInputString( SCCOL nCol, SCROW nRow, bool bForceSystemLocale = false ) const;
double GetValue( SCCOL nCol, SCROW nRow ) const;
const EditTextObject* GetEditText( SCCOL nCol, SCROW nRow ) const;
void RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );

4
sc/source/core/data/column3.cxx
View file

@ -3051,10 +3051,10 @@ double* ScColumn::GetValueCell( SCROW nRow )
return &sc::numeric_block::at(*it->data, aPos.second);
}
OUString ScColumn::GetInputString( const ScRefCellValue& aCell, SCROW nRow, const svl::SharedString** pShared, bool bForceSystemLocale ) const
OUString ScColumn::GetInputString( const ScRefCellValue& aCell, SCROW nRow, bool bForceSystemLocale ) const
{
sal_uLong nFormat = GetNumberFormat(GetDoc().GetNonThreadedContext(), nRow);
return ScCellFormat::GetInputString(aCell, nFormat, *(GetDoc().GetFormatTable()), GetDoc(), pShared, false, bForceSystemLocale);
return ScCellFormat::GetInputString(aCell, nFormat, *(GetDoc().GetFormatTable()), GetDoc(), nullptr, false, bForceSystemLocale);
}
double ScColumn::GetValue( SCROW nRow ) const

2
sc/source/core/data/document.cxx
View file

@ -3583,7 +3583,7 @@ void ScDocument::DiscardFormulaGroupContext()
OUString ScDocument::GetInputString(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bForceSystemLocale ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
return maTabs[nTab]->GetInputString( nCol, nRow, nullptr, bForceSystemLocale );
return maTabs[nTab]->GetInputString( nCol, nRow, bForceSystemLocale );
else
return OUString();
}

4
sc/source/core/data/table2.cxx
View file

@ -1787,10 +1787,10 @@ double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow )
return CreateColumnIfNotExists(nCol).GetValueCell(nRow);
}
OUString ScTable::GetInputString( SCCOL nCol, SCROW nRow, const svl::SharedString** pShared, bool bForceSystemLocale ) const
OUString ScTable::GetInputString( SCCOL nCol, SCROW nRow, bool bForceSystemLocale ) const
{
if (ValidColRow(nCol, nRow) && nCol < GetAllocatedColumnsCount())
return aCol[nCol].GetInputString( nRow, pShared, bForceSystemLocale );
return aCol[nCol].GetInputString( nRow, bForceSystemLocale );
else
return OUString();
}

7
sfx2/source/bastyp/frmhtmlw.cxx
View file

@ -215,8 +215,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
}
void SfxFrameHTMLWriter::Out_FrameDescriptor(
SvStream& rOut, const OUString& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
OUString *pNonConvertableChars )
SvStream& rOut, const OUString& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet )
{
try
{
@ -232,7 +231,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
rBaseURL, aURL );
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\"");
rOut.WriteOString( sOut.makeStringAndClear() );
HTMLOutFuncs::Out_String( rOut, aURL, pNonConvertableChars );
HTMLOutFuncs::Out_String( rOut, aURL );
sOut.append('\"');
}
}
@ -242,7 +241,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
rOut.WriteOString( sOut.makeStringAndClear() );
HTMLOutFuncs::Out_String( rOut, aStr, pNonConvertableChars );
HTMLOutFuncs::Out_String( rOut, aStr );
sOut.append('\"');
}

26
svtools/source/svhtml/htmlout.cxx
View file

@ -598,8 +598,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
bool bOutStarBasic,
const char *pDelim,
const char *pIndentArea,
const char *pIndentMap,
OUString *pNonConvertableChars )
const char *pIndentMap )
{
const OUString& rOutName = !rName.isEmpty() ? rName : rIMap.GetName();
DBG_ASSERT( !rOutName.isEmpty(), "No ImageMap-Name" );
@ -613,7 +612,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
OOO_STRING_SVTOOLS_HTML_O_name
"=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
Out_String( rStream, rOutName, pNonConvertableChars );
Out_String( rStream, rOutName );
rStream.WriteCharPtr( "\">" );
for( size_t i=0; i<rIMap.GetIMapObjectCount(); i++ )
@ -714,7 +713,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
rBaseURL, aURL );
sOut.append(OOO_STRING_SVTOOLS_HTML_O_href "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
Out_String( rStream, aURL, pNonConvertableChars ).WriteChar( '\"' );
Out_String( rStream, aURL ).WriteChar( '\"' );
}
else
rStream.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_nohref );
@ -724,7 +723,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
Out_String( rStream, rObjName, pNonConvertableChars ).WriteChar( '\"' );
Out_String( rStream, rObjName ).WriteChar( '\"' );
}
const OUString& rTarget = pObj->GetTarget();
@ -732,7 +731,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_target "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
Out_String( rStream, rTarget, pNonConvertableChars ).WriteChar( '\"' );
Out_String( rStream, rTarget ).WriteChar( '\"' );
}
OUString rDesc( pObj->GetAltText() );
@ -743,13 +742,13 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_alt "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
Out_String( rStream, rDesc, pNonConvertableChars ).WriteChar( '\"' );
Out_String( rStream, rDesc ).WriteChar( '\"' );
}
const SvxMacroTableDtor& rMacroTab = pObj->GetMacroTable();
if( pEventTable && !rMacroTab.empty() )
Out_Events( rStream, rMacroTab, pEventTable,
bOutStarBasic, pNonConvertableChars );
bOutStarBasic );
rStream.WriteChar( '>' );
}
@ -773,8 +772,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
ScriptType eScriptType,
const OUString& rSrc,
const OUString *pSBLibrary,
const OUString *pSBModule,
OUString *pNonConvertableChars )
const OUString *pSBModule )
{
// script is not indented!
OStringBuffer sOut;
@ -785,7 +783,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_language "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
Out_String( rStrm, rLanguage, pNonConvertableChars );
Out_String( rStrm, rLanguage );
sOut.append('\"');
}
@ -793,7 +791,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc), pNonConvertableChars );
Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc) );
sOut.append('\"');
}
@ -801,7 +799,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdlibrary "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
Out_String( rStrm, *pSBLibrary, pNonConvertableChars );
Out_String( rStrm, *pSBLibrary );
sOut.append('\"');
}
@ -809,7 +807,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdmodule "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
Out_String( rStrm, *pSBModule, pNonConvertableChars );
Out_String( rStrm, *pSBModule );
sOut.append('\"');
}

11
svx/source/dialog/txencbox.cxx
View file

@ -132,7 +132,7 @@ SvxTextEncodingTreeView::~SvxTextEncodingTreeView()
namespace
{
std::vector<int> FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags)
std::vector<int> FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags)
{
std::vector<int> aRet;
@ -156,7 +156,7 @@ namespace
nEnc == RTL_TEXTENCODING_UCS4) )
bInsert = false; // InfoFlags don't work for Unicode :-(
}
else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
else
bInsert = false;
}
}
@ -180,10 +180,9 @@ namespace
}
void SvxTextEncodingBox::FillFromTextEncodingTable(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags, nButIncludeInfoFlags));
std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags));
m_xControl->freeze();
for (auto j : aRet)
{
@ -196,7 +195,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
void SvxTextEncodingTreeView::FillFromTextEncodingTable(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags, /*nButIncludeInfoFlags*/0));
std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags));
m_xControl->freeze();
for (auto j : aRet)
{