loplugin:stringconstant

Change-Id: Ia32a99530b8b32dc82dbca79d8c8ca1f2e090a96
This commit is contained in:
Kohei Yoshida 2016-11-12 19:50:49 -05:00
parent 8ce6e2e8bc
commit cc46bcc68b

View File

@ -267,7 +267,7 @@ void ScDPInitState::RemoveMember()
namespace { namespace {
#if DUMP_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void lcl_DumpRow( void dumpRow(
const OUString& rType, const OUString& rName, const ScDPAggData* pAggData, const OUString& rType, const OUString& rName, const ScDPAggData* pAggData,
ScDocument* pDoc, ScAddress& rPos ) ScDocument* pDoc, ScAddress& rPos )
{ {
@ -284,7 +284,7 @@ void lcl_DumpRow(
rPos.SetRow( nRow + 1 ); rPos.SetRow( nRow + 1 );
} }
void lcl_Indent( ScDocument* pDoc, SCROW nStartRow, const ScAddress& rPos ) void indent( ScDocument* pDoc, SCROW nStartRow, const ScAddress& rPos )
{ {
SCCOL nCol = rPos.Col(); SCCOL nCol = rPos.Col();
SCTAB nTab = rPos.Tab(); SCTAB nTab = rPos.Tab();
@ -1766,7 +1766,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
#if DUMP_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const
{ {
lcl_DumpRow( OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); dumpRow("ScDPResultMember", GetName(), nullptr, pDoc, rPos);
SCROW nStartRow = rPos.Row(); SCROW nStartRow = rPos.Row();
if (pDataRoot) if (pDataRoot)
@ -1775,7 +1775,7 @@ void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument
if (pChildDimension) if (pChildDimension)
pChildDimension->DumpState( pRefMember, pDoc, rPos ); pChildDimension->DumpState( pRefMember, pDoc, rPos );
lcl_Indent( pDoc, nStartRow, rPos ); indent(pDoc, nStartRow, rPos);
} }
void ScDPResultMember::Dump(int nIndent) const void ScDPResultMember::Dump(int nIndent) const
@ -2628,7 +2628,7 @@ void ScDPDataMember::UpdateRunningTotals(
#if DUMP_PIVOT_TABLE #if DUMP_PIVOT_TABLE
void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const
{ {
lcl_DumpRow( OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); dumpRow("ScDPDataMember", GetName(), &aAggregate, pDoc, rPos);
SCROW nStartRow = rPos.Row(); SCROW nStartRow = rPos.Row();
const ScDPDataDimension* pDataChild = GetChildDimension(); const ScDPDataDimension* pDataChild = GetChildDimension();
@ -2636,7 +2636,7 @@ void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument*
if ( pDataChild && pRefChild ) if ( pDataChild && pRefChild )
pDataChild->DumpState( pRefChild, pDoc, rPos ); pDataChild->DumpState( pRefChild, pDoc, rPos );
lcl_Indent( pDoc, nStartRow, rPos ); indent(pDoc, nStartRow, rPos);
} }
void ScDPDataMember::Dump(int nIndent) const void ScDPDataMember::Dump(int nIndent) const
@ -3444,7 +3444,7 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember(
void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const
{ {
OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName());
lcl_DumpRow( OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); dumpRow("ScDPResultDimension", aDimName, nullptr, pDoc, rPos);
SCROW nStartRow = rPos.Row(); SCROW nStartRow = rPos.Row();
@ -3455,7 +3455,7 @@ void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocum
pMember->DumpState( pRefMember, pDoc, rPos ); pMember->DumpState( pRefMember, pDoc, rPos );
} }
lcl_Indent( pDoc, nStartRow, rPos ); indent(pDoc, nStartRow, rPos);
} }
void ScDPResultDimension::Dump(int nIndent) const void ScDPResultDimension::Dump(int nIndent) const
@ -3824,7 +3824,7 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim,
void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const
{ {
OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)");
lcl_DumpRow( OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); dumpRow("ScDPDataDimension", aDimName, nullptr, pDoc, rPos);
SCROW nStartRow = rPos.Row(); SCROW nStartRow = rPos.Row();
@ -3836,7 +3836,7 @@ void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocumen
pDataMember->DumpState( pRefMember, pDoc, rPos ); pDataMember->DumpState( pRefMember, pDoc, rPos );
} }
lcl_Indent( pDoc, nStartRow, rPos ); indent(pDoc, nStartRow, rPos);
} }
void ScDPDataDimension::Dump(int nIndent) const void ScDPDataDimension::Dump(int nIndent) const