Kaydet (Commit) 73ab2864 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Why in the world do you need to fully-qualify own member methods !?

Change-Id: Iaaafa2d3c214f83f9c48edd80da20da34f30358c
üst 62a2e5c0
...@@ -1432,16 +1432,14 @@ ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress() ...@@ -1432,16 +1432,14 @@ ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress()
void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell, void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell,
const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat ) const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat )
{ {
ScChangeActionContent::SetValue( aOldValue, pOldCell, SetValue( aOldValue, pOldCell, nFormat, pCell, pFromDoc, pToDoc );
nFormat, pCell, pFromDoc, pToDoc );
} }
void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell, void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell,
const ScDocument* pFromDoc, ScDocument* pToDoc ) const ScDocument* pFromDoc, ScDocument* pToDoc )
{ {
ScChangeActionContent::SetValue( aOldValue, pOldCell, SetValue( aOldValue, pOldCell, aBigRange.aStart.MakeAddress(), pCell, pFromDoc, pToDoc );
aBigRange.aStart.MakeAddress(), pCell, pFromDoc, pToDoc );
} }
...@@ -1459,8 +1457,8 @@ void ScChangeActionContent::SetOldNewCells( ScBaseCell* pOldCellP, ...@@ -1459,8 +1457,8 @@ void ScChangeActionContent::SetOldNewCells( ScBaseCell* pOldCellP,
{ {
pOldCell = pOldCellP; pOldCell = pOldCellP;
pNewCell = pNewCellP; pNewCell = pNewCellP;
ScChangeActionContent::SetCell( aOldValue, pOldCell, nOldFormat, pDoc ); SetCell( aOldValue, pOldCell, nOldFormat, pDoc );
ScChangeActionContent::SetCell( aNewValue, pNewCell, nNewFormat, pDoc ); SetCell( aNewValue, pNewCell, nNewFormat, pDoc );
} }
void ScChangeActionContent::SetNewCell( void ScChangeActionContent::SetNewCell(
...@@ -1468,7 +1466,7 @@ void ScChangeActionContent::SetNewCell( ...@@ -1468,7 +1466,7 @@ void ScChangeActionContent::SetNewCell(
{ {
OSL_ENSURE( !pNewCell, "ScChangeActionContent::SetNewCell: overwriting existing cell" ); OSL_ENSURE( !pNewCell, "ScChangeActionContent::SetNewCell: overwriting existing cell" );
pNewCell = pCell; pNewCell = pCell;
ScChangeActionContent::SetCell( aNewValue, pNewCell, 0, pDoc ); SetCell( aNewValue, pNewCell, 0, pDoc );
// #i40704# allow to set formatted text here - don't call SetNewValue with string from XML filter // #i40704# allow to set formatted text here - don't call SetNewValue with string from XML filter
if (!rFormatted.isEmpty()) if (!rFormatted.isEmpty())
...@@ -1567,7 +1565,7 @@ void ScChangeActionContent::GetRefString( ...@@ -1567,7 +1565,7 @@ void ScChangeActionContent::GetRefString(
if ( nFlags ) if ( nFlags )
{ {
const ScBaseCell* pCell = GetNewCell(); const ScBaseCell* pCell = GetNewCell();
if ( ScChangeActionContent::GetContentCellType( pCell ) == SC_CACCT_MATORG ) if ( GetContentCellType( pCell ) == SC_CACCT_MATORG )
{ {
ScBigRange aLocalBigRange( GetBigRange() ); ScBigRange aLocalBigRange( GetBigRange() );
SCCOL nC; SCCOL nC;
...@@ -1681,7 +1679,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr, ...@@ -1681,7 +1679,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
{ {
if ( pCell ) if ( pCell )
{ {
if ( ScChangeActionContent::NeedsNumberFormat( pCell ) ) if ( NeedsNumberFormat( pCell ) )
GetStringOfCell( rStr, pCell, pDoc, pDoc->GetNumberFormat( rPos ) ); GetStringOfCell( rStr, pCell, pDoc, pDoc->GetNumberFormat( rPos ) );
else else
GetStringOfCell( rStr, pCell, pDoc, 0 ); GetStringOfCell( rStr, pCell, pDoc, 0 );
...@@ -1694,7 +1692,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr, ...@@ -1694,7 +1692,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr, void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
const ScBaseCell* pCell, const ScDocument* pDoc, sal_uLong nFormat ) const ScBaseCell* pCell, const ScDocument* pDoc, sal_uLong nFormat )
{ {
if ( ScChangeActionContent::GetContentCellType( pCell ) ) if ( GetContentCellType( pCell ) )
{ {
switch ( pCell->GetCellType() ) switch ( pCell->GetCellType() )
{ {
...@@ -1779,7 +1777,7 @@ void ScChangeActionContent::SetValue( ...@@ -1779,7 +1777,7 @@ void ScChangeActionContent::SetValue(
rStr = rtl::OUString(); rStr = rtl::OUString();
if ( pCell ) if ( pCell )
pCell->Delete(); pCell->Delete();
if ( ScChangeActionContent::GetContentCellType( pOrgCell ) ) if ( GetContentCellType( pOrgCell ) )
{ {
pCell = pOrgCell->Clone( *pToDoc ); pCell = pOrgCell->Clone( *pToDoc );
switch ( pOrgCell->GetCellType() ) switch ( pOrgCell->GetCellType() )
...@@ -1916,7 +1914,7 @@ void ScChangeActionContent::PutValueToDoc( ...@@ -1916,7 +1914,7 @@ void ScChangeActionContent::PutValueToDoc(
pDoc->SetString( aPos.Col(), aPos.Row(), aPos.Tab(), rValue ); pDoc->SetString( aPos.Col(), aPos.Row(), aPos.Tab(), rValue );
break; break;
default: default:
switch ( ScChangeActionContent::GetContentCellType( pCell ) ) switch ( GetContentCellType( pCell ) )
{ {
case SC_CACCT_MATORG : case SC_CACCT_MATORG :
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment