diff options
| author | Henning Brinkmann[hbrinkm] <hbrinkm@openoffice.org> | 2010-01-05 17:15:21 +0100 |
|---|---|---|
| committer | Henning Brinkmann[hbrinkm] <hbrinkm@openoffice.org> | 2010-01-05 17:15:21 +0100 |
| commit | 74ccf9cc43e3e25914eeb10526c5859ee3f333ed (patch) | |
| tree | ee9d67aa1ca783a2ceb9baafaa71052656ea7f76 /oox | |
| parent | c801c731905869adc4f05f9b91ba7be649bd1ba4 (diff) | |
| parent | 7fef57f108fe4f219773d5511040bd166ee0a01c (diff) | |
writerfilter07: merged DEV300_m68
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 4 | ||||
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 | ||||
| -rw-r--r-- | oox/source/xls/formulabase.cxx | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index f681477076bf..011a96d7a0ca 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -60,12 +60,12 @@ #include <tools/stream.hxx> #include <tools/string.hxx> #include <vcl/cvtgrf.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include <vcl/graph.hxx> #include <goodies/grfmgr.hxx> #include <rtl/strbuf.hxx> #include <sfx2/app.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svx/escherex.hxx> #include <svx/svxenum.hxx> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 68c20cca6b9c..00db2500fd06 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -62,13 +62,13 @@ #include <tools/stream.hxx> #include <tools/string.hxx> #include <vcl/cvtgrf.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include <vcl/graph.hxx> #include <vcl/outdev.hxx> #include <goodies/grfmgr.hxx> #include <rtl/strbuf.hxx> #include <sfx2/app.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svx/escherex.hxx> #include <svx/svdoashp.hxx> #include <svx/svxenum.hxx> diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx index 5240960f7a88..67c595d2b9f0 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; |