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@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

1 files changed, 20 insertions, 13 deletions

diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index ba4e02041faa..6005a849fb0f 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -32,7 +32,8 @@
 #define SC_FMTUNO_HXX
 
 #include "address.hxx"
-#include "formula/grammar.hxx"
+#include "conditio.hxx"
+#include <formula/grammar.hxx>
 #include <tools/list.hxx>
 #include <svtools/itemprop.hxx>
 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
@@ -61,16 +62,19 @@ struct ScCondFormatEntryItem
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens1;
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens2;
-    String             maExpr1;
-    String             maExpr2;
-    String             maPosStr;  // formula position as text
-    String             maStyle;   // display name as stored in ScStyleSheet
-    ScAddress          maPos;
-    formula::FormulaGrammar::Grammar meGrammar; // grammar used with maExpr1 and maExpr2
-    USHORT             mnMode;    // stores enum ScConditionMode
+    String              maExpr1;
+    String              maExpr2;
+    String              maExprNmsp1;
+    String              maExprNmsp2;
+    String              maPosStr;  // formula position as text
+    String              maStyle;   // display name as stored in ScStyleSheet
+    ScAddress           maPos;
+    formula::FormulaGrammar::Grammar meGrammar1; // grammar used with maExpr1
+    formula::FormulaGrammar::Grammar meGrammar2; // grammar used with maExpr2
+    ScConditionMode     meMode;
 
     // Make sure the grammar is initialized for API calls.
-    ScCondFormatEntryItem() : meGrammar( formula::FormulaGrammar::GRAM_UNSPECIFIED ) {}
+    ScCondFormatEntryItem();
 };
 
 class ScTableConditionalFormat : public cppu::WeakImplHelper5<
@@ -89,11 +93,11 @@ private:
     ScTableConditionalFormat(); // disable
 public:
                             ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey,
-                                                        const formula::FormulaGrammar::Grammar eGrammar);
+                                formula::FormulaGrammar::Grammar eGrammar);
     virtual                 ~ScTableConditionalFormat();
 
-    void                    FillFormat( ScConditionalFormat& rFormat,
-                                            ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const;
+    void                    FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc,
+                                formula::FormulaGrammar::Grammar eGrammar) const;
     void                    DataChanged();
 
                             // XSheetConditionalEntries
@@ -211,7 +215,10 @@ private:
     USHORT              nMode;          // enum ScConditionMode
     String              aExpr1;
     String              aExpr2;
-    formula::FormulaGrammar::Grammar  meGrammar;      // grammar used with aExpr1 and aExpr2
+    String              maExprNmsp1;
+    String              maExprNmsp2;
+    formula::FormulaGrammar::Grammar  meGrammar1;      // grammar used with aExpr1 and aExpr2
+    formula::FormulaGrammar::Grammar  meGrammar2;      // grammar used with aExpr1 and aExpr2
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1;
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2;
     ScAddress           aSrcPos;