Kaydet (Commit) aaa0ead8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Umgekehrte Polnische Notation is German for Reverse Polish Notation

Change-Id: I80480f963b643596ff1c0e93af3eaa6ffc63c9dd
üst 761959e7
...@@ -570,7 +570,7 @@ void ScConditionEntry::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) ...@@ -570,7 +570,7 @@ void ScConditionEntry::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt )
static bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) static bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
{ {
// verglichen wird nur das nicht-UPN Array // verglichen wird nur das nicht-RPN Array
if ( pArr1 && pArr2 ) if ( pArr1 && pArr2 )
{ {
......
...@@ -559,7 +559,7 @@ ScFormulaCell::ScFormulaCell( ...@@ -559,7 +559,7 @@ ScFormulaCell::ScFormulaCell(
mbNeedsNumberFormat( false ), mbNeedsNumberFormat( false ),
aPos( rPos ) aPos( rPos )
{ {
// UPN-Array generation // RPN array generation
if( pCode->GetLen() && !pCode->GetCodeError() && !pCode->GetCodeLen() ) if( pCode->GetLen() && !pCode->GetCodeError() && !pCode->GetCodeLen() )
{ {
ScCompiler aComp( pDocument, aPos, *pCode); ScCompiler aComp( pDocument, aPos, *pCode);
...@@ -995,7 +995,7 @@ void ScFormulaCell::CalcAfterLoad() ...@@ -995,7 +995,7 @@ void ScFormulaCell::CalcAfterLoad()
bDirty = true; bDirty = true;
bNewCompiled = true; bNewCompiled = true;
} }
// The UPN array is not created when a Calc 3.0-Doc has been read as the Range Names exist until now. // The RPN array is not created when a Calc 3.0-Doc has been read as the Range Names exist until now.
if( pCode->GetLen() && !pCode->GetCodeLen() && !pCode->GetCodeError() ) if( pCode->GetLen() && !pCode->GetCodeLen() && !pCode->GetCodeError() )
{ {
ScCompiler aComp(pDocument, aPos, *pCode); ScCompiler aComp(pDocument, aPos, *pCode);
...@@ -1312,7 +1312,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) ...@@ -1312,7 +1312,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
nSeenInIteration = pDocument->GetRecursionHelper().GetIteration(); nSeenInIteration = pDocument->GetRecursionHelper().GetIteration();
if( !pCode->GetCodeLen() && !pCode->GetCodeError() ) if( !pCode->GetCodeLen() && !pCode->GetCodeError() )
{ {
// #i11719# no UPN and no error and no token code but result string present // #i11719# no RPN and no error and no token code but result string present
// => interpretation of this cell during name-compilation and unknown names // => interpretation of this cell during name-compilation and unknown names
// => can't exchange underlying code array in CompileTokenArray() / // => can't exchange underlying code array in CompileTokenArray() /
// Compile() because interpreter's token iterator would crash or pCode // Compile() because interpreter's token iterator would crash or pCode
...@@ -1326,7 +1326,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) ...@@ -1326,7 +1326,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
pCode->SetCodeError( errNoCode ); pCode->SetCodeError( errNoCode );
// This is worth an assertion; if encountered in daily work // This is worth an assertion; if encountered in daily work
// documents we might need another solution. Or just confirm correctness. // documents we might need another solution. Or just confirm correctness.
OSL_FAIL( "ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string" ); OSL_FAIL( "ScFormulaCell::Interpret: no RPN, no error, no token, but hybrid formula string" );
return; return;
} }
CompileTokenArray(); CompileTokenArray();
...@@ -1593,7 +1593,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) ...@@ -1593,7 +1593,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
else else
{ {
// Cells with compiler errors should not be marked dirty forever // Cells with compiler errors should not be marked dirty forever
OSL_ENSURE( pCode->GetCodeError(), "no UPN-Code und no errors ?!?!" ); OSL_ENSURE( pCode->GetCodeError(), "no RPN code und no errors ?!?!" );
bDirty = false; bDirty = false;
bTableOpDirty = false; bTableOpDirty = false;
} }
......
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