INTEGRATION: CWS xmlfilter04 (1.2.54); FILE MERGED

2008/03/07 02:06:04 kohei 1.2.54.1: remove the two boolean properties from ScFormulaParserObj and put the new formula convention property.

1 files changed, 2 insertions, 3 deletions

diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 24d017daa03d..4d10f044ba12 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -73,9 +73,8 @@ private:
     ScCompiler::OpCodeMapPtr    mxOpCodeMap;
     ScDocShell*         mpDocShell;
     ScAddress           maRefPos;
+    sal_Int16           mnConv;
     bool                mbEnglish;
-    bool                mbR1C1;
-    bool                mbComp3D;
     bool                mbIgnoreSpaces;
 
     void                    SetCompilerFlags( ScCompiler& rCompiler ) const;