diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:49:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:49:33 +0000 |
| commit | 5f9d8124f10760c5c254b22243a8bf885e0b7d87 (patch) | |
| tree | 482697354ce78e94055d9487efbbe424f3c97c5e /sc/inc | |
| parent | ef095ad69f33076584661e20a861aeab33b12675 (diff) | |
INTEGRATION: CWS koheiformula01 (1.35.12); FILE MERGED
2008/04/25 16:55:28 kohei 1.35.12.5: specify grammar instead of directly specifying the address convention when compiling formula strings.
2008/04/23 15:07:11 kohei 1.35.12.4: RESYNC: (1.35-1.36); FILE MERGED
2008/03/19 17:37:07 kohei 1.35.12.3: changed a lot of places to prepare for a single global grammar value that applies to all places where formulas are used.
2008/03/18 23:14:31 kohei 1.35.12.2: switched to putting the separators into mxSymbolsNative and put everything else back to the way it was.
2008/03/14 01:06:11 kohei 1.35.12.1: initial commit from the ooo-build patch with lots of build breakages fixed.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/compiler.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 671d82fdf397..3f8eaf1f8109 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: compiler.hxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.37 $ * * This file is part of OpenOffice.org. * @@ -446,11 +446,11 @@ private: public: ScCompiler( ScDocument* pDocument, const ScAddress&, - const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); + const ScGrammar::Grammar eGrammar ); ScCompiler( ScDocument* pDocument, const ScAddress&, ScTokenArray& rArr, - const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); + const ScGrammar::Grammar eGrammar ); static bool IsInitialized() { @@ -523,8 +523,7 @@ public: const String& GetCorrectedFormula() { return aCorrectedFormula; } // Use convention from this->aPos by default - ScTokenArray* CompileString( const String& rFormula, - ScAddress::Convention eConv = ScAddress::CONV_UNSPECIFIED ); + ScTokenArray* CompileString( const String& rFormula ); BOOL CompileTokenArray(); short GetNumFormatType() { return nNumFmt; } const ScDocument* GetDoc() const { return pDoc; } |