diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 10:26:21 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 10:26:21 +0100 |
| commit | a78f5a3e93eaa64b8cffbadf7358a514d21ace56 (patch) | |
| tree | 48f95a811bd1f539d53e82b574becbc60d777f09 | |
| parent | cd321465360dc00826ea5e8e342e3c55df09b861 (diff) | |
| parent | 53f4e3505936f435b19dce3268bb76bbfc8ae3eb (diff) | |
CWS-TOOLING: integrate CWS os139_DEV300ooo/DEV300_m68
| -rw-r--r-- | oox/source/xls/formulabase.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx index 5240960f7..67c595d2b 100644 --- a/oox/source/xls/formulabase.cxx +++ b/oox/source/xls/formulabase.cxx @@ -1655,13 +1655,16 @@ void FormulaProcessorBase::extractCellRangeList( ApiCellRangeList& orRanges, sal_Int32 nOpCode = aIt->OpCode; switch( eState ) { + // #i107275# accept OPCODE_SEP and OPCODE_LIST as separator token case STATE_REF: - if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; + if( nOpCode == OPCODE_SEP ) eState = STATE_SEP; + else if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel ); else eState = STATE_ERROR; break; case STATE_SEP: if( nOpCode == OPCODE_PUSH ) eState = lclProcessRef( orRanges, aIt->Data, bAllowRelative, nFilterBySheet ); + else if( nOpCode == OPCODE_SEP ) eState = STATE_SEP; else if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; else if( nOpCode == OPCODE_OPEN ) eState = lclProcessOpen( nParenLevel ); else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel ); @@ -1669,13 +1672,15 @@ void FormulaProcessorBase::extractCellRangeList( ApiCellRangeList& orRanges, break; case STATE_OPEN: if( nOpCode == OPCODE_PUSH ) eState = lclProcessRef( orRanges, aIt->Data, bAllowRelative, nFilterBySheet ); + else if( nOpCode == OPCODE_SEP ) eState = STATE_SEP; else if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; else if( nOpCode == OPCODE_OPEN ) eState = lclProcessOpen( nParenLevel ); else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel ); else eState = STATE_ERROR; break; case STATE_CLOSE: - if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; + if( nOpCode == OPCODE_SEP ) eState = STATE_SEP; + else if( nOpCode == OPCODE_LIST ) eState = STATE_SEP; else if( nOpCode == OPCODE_CLOSE ) eState = lclProcessClose( nParenLevel ); else eState = STATE_ERROR; break; |