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, 13 insertions, 7 deletions

diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index abb9d1d06a22..bcd3435668be 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -31,15 +31,14 @@
 #ifndef SC_TOKENUNO_HXX
 #define SC_TOKENUNO_HXX
 
-#include <svtools/lstner.hxx>
-#include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sheet/XFormulaParser.hpp>
-#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
+#include <com/sun/star/sheet/FormulaToken.hpp>
+#include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <cppuhelper/implbase3.hxx>
+#include <svtools/lstner.hxx>
 #include <formula/FormulaOpCodeMapperObj.hxx>
 #include "address.hxx"
 #include "compiler.hxx"
@@ -47,6 +46,7 @@
 class ScTokenArray;
 class ScDocShell;
 
+// ============================================================================
 
 class ScTokenConversion
 {
@@ -61,6 +61,7 @@ public:
                         const ScTokenArray& rTokenArray );
 };
 
+// ============================================================================
 
 class ScFormulaParserObj : public ::cppu::WeakImplHelper3<
                             ::com::sun::star::sheet::XFormulaParser,
@@ -73,7 +74,6 @@ private:
     ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > maExternalLinks;
     ScCompiler::OpCodeMapPtr    mxOpCodeMap;
     ScDocShell*         mpDocShell;
-    ScAddress           maRefPos;
     sal_Int16           mnConv;
     bool                mbEnglish;
     bool                mbIgnoreSpaces;
@@ -89,10 +89,12 @@ public:
 
                             // XFormulaParser
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula(
-                                    const ::rtl::OUString& aFormula )
+                                    const ::rtl::OUString& aFormula,
+                                    const ::com::sun::star::table::CellAddress& rReferencePos )
                                 throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence<
-                                    ::com::sun::star::sheet::FormulaToken >& aTokens )
+                                    ::com::sun::star::sheet::FormulaToken >& aTokens,
+                                    const ::com::sun::star::table::CellAddress& rReferencePos )
                                 throw (::com::sun::star::uno::RuntimeException);
 
                             // XPropertySet
@@ -145,11 +147,15 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException);
 };
 
+// ============================================================================
+
 class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj
 {
 public:
     ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler);
 };
 
+// ============================================================================
+
 #endif