diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:15:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:15:25 +0000 |
| commit | 6053ef8070f9cf9720bee949e231b2a8fb91fbda (patch) | |
| tree | cf067d71fbc1bea652952c952d215936d370aafd /sc/inc/conditio.hxx | |
| parent | 01f2bcc9a04417028f39ed6a58a89c7979aaed95 (diff) | |
INTEGRATION: CWS odff (1.10.158); FILE MERGED
2008/02/15 14:23:03 er 1.10.158.4: #i81063# grammar here, grammar there, grammar everywhere
2008/02/07 19:37:07 er 1.10.158.3: #i81063# introduce StorageGrammar per document
2008/01/21 18:50:53 er 1.10.158.2: RESYNC: (1.10-1.11); FILE MERGED
2007/09/06 10:43:07 er 1.10.158.1: #i81063# new ScGrammar; get rid of SetCompileEnglish, SetCompileXML, GetEnglishFormula, ...
Diffstat (limited to 'sc/inc/conditio.hxx')
| -rw-r--r-- | sc/inc/conditio.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 81d15c418804..88aec9fd5bb5 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -4,9 +4,9 @@ * * $RCSfile: conditio.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2008-01-10 13:08:13 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:15:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,10 @@ #include "address.hxx" #endif +#ifndef SC_GRAMMAR_HXX +#include "grammar.hxx" +#endif + #ifndef _SVARRAY_HXX //autogen #include <svtools/svarray.hxx> #endif @@ -95,6 +99,7 @@ class ScConditionEntry double nVal2; String aStrVal1; // eingegeben oder berechnet String aStrVal2; + ScGrammar::Grammar eTempGrammar; // grammar to be used on (re)compilation, e.g. in XML import BOOL bIsStr1; // um auch leere Strings zu erkennen BOOL bIsStr2; ScTokenArray* pFormula1; // eingegebene Formel @@ -110,8 +115,8 @@ class ScConditionEntry BOOL bFirstRun; void MakeCells( const ScAddress& rPos ); - void Compile( const String& rExpr1, const String& rExpr2, BOOL bEnglish, - BOOL bCompileXML, BOOL bTextToReal ); + void Compile( const String& rExpr1, const String& rExpr2, + const ScGrammar::Grammar eGrammar, BOOL bTextToReal ); void Interpret( const ScAddress& rPos ); BOOL IsValid( double nArg ) const; @@ -126,7 +131,7 @@ public: ScConditionEntry( ScConditionMode eOper, const String& rExpr1, const String& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - BOOL bCompileEnglish, BOOL bCompileXML ); + const ScGrammar::Grammar eGrammar ); ScConditionEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos ); @@ -152,8 +157,7 @@ public: void SetFormula2( const ScTokenArray& rArray ); String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, - BOOL bEnglish = FALSE, BOOL bCompileXML = FALSE, - BOOL bTextToReal = FALSE ) const; + const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ) const; ScTokenArray* CreateTokenArry( USHORT nPos ) const; @@ -188,7 +192,7 @@ public: const String& rExpr1, const String& rExpr2, ScDocument* pDocument, const ScAddress& rPos, const String& rStyle, - BOOL bCompileEnglish = FALSE, BOOL bCompileXML = FALSE ); + const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); ScCondFormatEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos, |