summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-04-10 14:28:00 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-04-10 15:09:57 -0400
commit8bc22acaa0825c734e4f2dda177ad93b61b488a2 (patch)
tree03a258d22589e85dce4179ec5a3ed3e3ae721873 /sc/source
parent65775b4e3fc7485ce42842abdd36eddc197bcd1d (diff)
Zelle->Cell, Ergebnis->Result and bit of cleanup.
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/excel/excform.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index c5d222867207..0279b41d235a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -120,25 +120,25 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
if( GetAddressConverter().ConvertAddress( aScPos, rXclPos, GetCurrScTab(), true ) )
{
// Formula will be read next, length in nFormLen
- const ScTokenArray* pErgebnis = 0;
- sal_Bool bConvert;
+ const ScTokenArray* pResult = NULL;
+ bool bConvert = false;
pFormConv->Reset( aScPos );
if( bShrFmla )
- bConvert = !pFormConv->GetShrFmla( pErgebnis, maStrm, nFormLen );
+ bConvert = !pFormConv->GetShrFmla( pResult, maStrm, nFormLen );
else
- bConvert = sal_True;
+ bConvert = true;
if( bConvert )
- eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
+ eErr = pFormConv->Convert( pResult, maStrm, nFormLen, true, FT_CellFormula);
- ScFormulaCell* pZelle = NULL;
+ ScFormulaCell* pCell = NULL;
- if( pErgebnis )
+ if (pResult)
{
- pZelle = new ScFormulaCell( pD, aScPos, pErgebnis );
- pD->PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pZelle, true );
+ pCell = new ScFormulaCell( pD, aScPos, pResult );
+ pD->PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pCell, true );
}
else
{
@@ -148,16 +148,16 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
if( eCellType == CELLTYPE_FORMULA )
{
pD->GetCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pBaseCell );
- pZelle = ( ScFormulaCell* ) pBaseCell;
- if( pZelle )
- pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
+ pCell = ( ScFormulaCell* ) pBaseCell;
+ if( pCell )
+ pCell->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
}
}
- if( pZelle )
+ if (pCell)
{
if( eErr != ConvOK )
- ExcelToSc::SetError( *pZelle, eErr );
+ ExcelToSc::SetError( *pCell, eErr );
(void)rCurVal;
}