[ooo-build-commit] Branch 'ooo/master' - reportbuilder/java

[Jan Holesovsky]

 reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c2813041d269312f12e847d194149a63b3e55b92
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Wed Jul 29 14:46:52 2009 +0000

    CWS-TOOLING: integrate CWS dr71
    2009-07-07 16:26:00 +0200 dr  r273805 : #i10000# unused variables
    2009-07-07 10:27:14 +0200 dr  r273780 : CWS-TOOLING: rebase CWS dr71 to trunk at 273468 (milestone: DEV300:m51)
    2009-07-01 11:28:24 +0200 dr  r273559 : #101471# special handling for XL library functions in ODF formulas (EUROCONVERT)
    2009-06-29 17:48:46 +0200 dr  r273478 : #i101471# typo
    2009-06-29 17:35:16 +0200 dr  r273477 : #i101471# import msoxl: formulas from conditional formatting and data validation
    2009-06-18 13:45:17 +0200 dr  r273115 : #101471# changed interface css.sheet.XFormulaParser
    2009-06-18 13:44:43 +0200 dr  r273114 : #101471# changed interface css.sheet.XFormulaParser
    2009-06-17 17:29:23 +0200 dr  r273089 : #i101471# extend the XFormulaParser interface with a ReferencePosition parameter, make rel-refs from msoxl: namespace working
    2009-06-17 17:28:39 +0200 dr  r273088 : #i101471# extend the XFormulaParser interface with a ReferencePosition parameter
    2009-06-17 17:28:19 +0200 dr  r273087 : #i101471# extend the XFormulaParser interface with a ReferencePosition parameter
    2009-06-17 17:27:19 +0200 dr  r273086 : #i101471# extend the XFormulaParser interface with a ReferencePosition parameter, remove that property from FormulaParser service
    2009-06-17 12:52:20 +0200 dr  r273059 : #i101471# import cell formulas from msoxl: namespace
    2009-06-16 11:40:50 +0200 dr  r273013 : #i101471# import formula namespace from xml elements
    2009-06-12 18:34:13 +0200 dr  r272935 : #i101471# external formula parser for oox in odf
    2009-06-12 18:33:13 +0200 dr  r272934 : #i101471# external formula parsers
    2009-06-12 18:29:46 +0200 dr  r272933 : #i101471# external formula parsers
    2009-06-05 15:53:47 +0200 dr  r272705 : #i101471# provide OOX formula parser as UNO service

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 2aa364d..321acb0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -155,7 +155,7 @@ public final class SOFormulaParser extends ComponentBase
     ;
 
     // com.sun.star.sheet.XFormulaParser:
-    public com.sun.star.sheet.FormulaToken[] parseFormula(String aFormula)
+    public com.sun.star.sheet.FormulaToken[] parseFormula(String aFormula, com.sun.star.table.CellAddress aReferencePos)
     {
         final ArrayList tokens = new ArrayList();
         if ( !"=".equals(aFormula) )
@@ -209,7 +209,7 @@ public final class SOFormulaParser extends ComponentBase
                         images.add(")");
                         tokens.add(opCode.Token);
                     }
-                        
+
                 }
 
                 parser.parse(formula);
@@ -239,7 +239,7 @@ public final class SOFormulaParser extends ComponentBase
         return (FormulaToken[]) tokens.toArray(new FormulaToken[tokens.size()]);
     }
 
-    public String printFormula(com.sun.star.sheet.FormulaToken[] aTokens)
+    public String printFormula(com.sun.star.sheet.FormulaToken[] aTokens, com.sun.star.table.CellAddress aReferencePos)
     {
         final StringBuffer ret = new StringBuffer();
         for (int i = 0; i < aTokens.length; i++)