[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
Kohei Yoshida
kohei.yoshida at gmail.com
Thu Mar 21 17:26:19 PDT 2013
sc/source/core/tool/chgtrack.cxx | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 8e66c3f128abe598d1935456b576bc3556ca0b34
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Mar 21 20:25:33 2013 -0400
Why in the world do you need to fully-qualify own member methods !?
Change-Id: Iaaafa2d3c214f83f9c48edd80da20da34f30358c
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 3e24e53..420c088 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1432,16 +1432,14 @@ ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress()
void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell,
const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat )
{
- ScChangeActionContent::SetValue( aOldValue, pOldCell,
- nFormat, pCell, pFromDoc, pToDoc );
+ SetValue( aOldValue, pOldCell, nFormat, pCell, pFromDoc, pToDoc );
}
void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell,
const ScDocument* pFromDoc, ScDocument* pToDoc )
{
- ScChangeActionContent::SetValue( aOldValue, pOldCell,
- aBigRange.aStart.MakeAddress(), pCell, pFromDoc, pToDoc );
+ SetValue( aOldValue, pOldCell, aBigRange.aStart.MakeAddress(), pCell, pFromDoc, pToDoc );
}
@@ -1459,8 +1457,8 @@ void ScChangeActionContent::SetOldNewCells( ScBaseCell* pOldCellP,
{
pOldCell = pOldCellP;
pNewCell = pNewCellP;
- ScChangeActionContent::SetCell( aOldValue, pOldCell, nOldFormat, pDoc );
- ScChangeActionContent::SetCell( aNewValue, pNewCell, nNewFormat, pDoc );
+ SetCell( aOldValue, pOldCell, nOldFormat, pDoc );
+ SetCell( aNewValue, pNewCell, nNewFormat, pDoc );
}
void ScChangeActionContent::SetNewCell(
@@ -1468,7 +1466,7 @@ void ScChangeActionContent::SetNewCell(
{
OSL_ENSURE( !pNewCell, "ScChangeActionContent::SetNewCell: overwriting existing cell" );
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
if (!rFormatted.isEmpty())
@@ -1567,7 +1565,7 @@ void ScChangeActionContent::GetRefString(
if ( nFlags )
{
const ScBaseCell* pCell = GetNewCell();
- if ( ScChangeActionContent::GetContentCellType( pCell ) == SC_CACCT_MATORG )
+ if ( GetContentCellType( pCell ) == SC_CACCT_MATORG )
{
ScBigRange aLocalBigRange( GetBigRange() );
SCCOL nC;
@@ -1681,7 +1679,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
{
if ( pCell )
{
- if ( ScChangeActionContent::NeedsNumberFormat( pCell ) )
+ if ( NeedsNumberFormat( pCell ) )
GetStringOfCell( rStr, pCell, pDoc, pDoc->GetNumberFormat( rPos ) );
else
GetStringOfCell( rStr, pCell, pDoc, 0 );
@@ -1694,7 +1692,7 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
const ScBaseCell* pCell, const ScDocument* pDoc, sal_uLong nFormat )
{
- if ( ScChangeActionContent::GetContentCellType( pCell ) )
+ if ( GetContentCellType( pCell ) )
{
switch ( pCell->GetCellType() )
{
@@ -1779,7 +1777,7 @@ void ScChangeActionContent::SetValue(
rStr = rtl::OUString();
if ( pCell )
pCell->Delete();
- if ( ScChangeActionContent::GetContentCellType( pOrgCell ) )
+ if ( GetContentCellType( pOrgCell ) )
{
pCell = pOrgCell->Clone( *pToDoc );
switch ( pOrgCell->GetCellType() )
@@ -1916,7 +1914,7 @@ void ScChangeActionContent::PutValueToDoc(
pDoc->SetString( aPos.Col(), aPos.Row(), aPos.Tab(), rValue );
break;
default:
- switch ( ScChangeActionContent::GetContentCellType( pCell ) )
+ switch ( GetContentCellType( pCell ) )
{
case SC_CACCT_MATORG :
{
More information about the Libreoffice-commits
mailing list