[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - filter/source oox/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Dec 9 19:54:27 PST 2009
filter/source/config/fragments/makefile.mk | 4 ++++
filter/source/config/tools/merge/pyAltFCFGMerge | 2 +-
oox/source/xls/formulabase.cxx | 9 +++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit d045a7695d3c03b7df95668717e072c181358149
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Dec 9 09:26:11 2009 +0000
CWS-TOOLING: integrate CWS os139
2009-12-03 10:21:21 +0100 os r277706 : #i107401# page number of page bound frames fixed
2009-11-30 13:44:26 +0100 dr r277673 : #i107275# accept OPCODE_SEP and OPCODE_LIST as range list separator
2009-11-30 13:28:12 +0100 dr r277672 : #i107275# ScRefTokenHelper::compileRangeRepresentation - allow parentheses enclosing the entire expression
2009-11-27 14:45:30 +0100 os r277669 : #i101821# find correct frame and SwPageFrame to print (or PDF export) selections
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 5240960..67c595d 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;
commit 778d7110ad08ca65a69508e86a70f5213d4f320d
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Dec 9 08:32:23 2009 +0000
CWS-TOOLING: integrate CWS fwk129
2009-12-07 14:19:39 +0100 mba r277741 : #i106367#: typo again
2009-12-02 10:32:30 +0100 jsk r277700 : fwk129: #i105719 - Fixed file size, wording and timing
2009-11-25 13:25:48 +0100 mav r277632 : #i107047# let the temporary stream be flushed in time
2009-11-25 13:17:36 +0100 mav r277631 : #i105719# switch to temporary file ealier to allow storing to the same location
2009-11-23 14:47:02 +0100 mav r277596 : #i105343# no outdated info in the buffer
2009-11-23 14:09:49 +0100 os r277595 : #i107064# copy styles in SwDoc::CreateCopy()
2009-11-23 10:38:29 +0100 mba r277592 : #i104338#: fix build without Java
2009-11-20 10:22:11 +0100 cd r277572 : #i107003# Make toolbar invisible before calling doLazyDelete. This prevents possible crashes in scenarios where a modal dialog is visible.
2009-11-19 18:30:33 +0100 mav r277569 : #i107035# let the temporary file be removed after the stream has been closed
2009-11-19 18:06:21 +0100 mba r277565 : #i106390#: crash caused by optimization
2009-11-19 17:58:34 +0100 mba r277564 : #i106367#: typo prevents correct asian language fallback
2009-11-19 17:57:16 +0100 mba r277563 : #i106390#: crash caused by optimization
2009-11-19 16:35:41 +0100 nn r277561 : #i106854# get source stream directly from document's storage instead of a temporary SfxMedium
2009-11-19 12:36:38 +0100 mav r277558 : #i106854# check the date of the original file
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index d398e03..6503062 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -185,8 +185,12 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
.IF "$(SOLAR_JAVA)"==""
#cmc, hack to workaround the java build requirement
+.IF "$(SYSTEM_PYTHON)" == "YES"
MERGE:=python ../tools/merge/pyAltFCFGMerge
.ELSE
+MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge
+.ENDIF
+.ELSE
MERGE := $(JAVAI) -jar $(SOLARBINDIR)$/FCFGMerge.jar
.ENDIF
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge
index b143caa..17fe16f 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -11,7 +11,7 @@
import sys, string, os.path
-CFGFILE = "../tools/merge/FCFGMerge.cfg"
+CFGFILE = "../../../../transex3/source/filter/merge/FCFGMerge.cfg"
PROP_XMLVERSION = "xmlversion" # // <= global cfg file
PROP_XMLENCODING = "xmlencoding" # // <= global cfg file
More information about the ooo-build-commit
mailing list