diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
| commit | 1c08c265487d696b92979c8890470efe0cbfa95c (patch) | |
| tree | 013b8931ec94271db465014cb9b263378a6e14db /sc/inc/compiler.hxx | |
| parent | fa9f4faf3a00db816a79302001003f6ad47c93e1 (diff) | |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'sc/inc/compiler.hxx')
| -rw-r--r-- | sc/inc/compiler.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index a34933557c02..efad8fb749ef 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -379,8 +379,8 @@ private: The previous grammar that was active before SetFormulaLanguage(). */ void SetGrammarAndRefConvention( - const ScGrammar::Grammar eNewGrammar, - const ScGrammar::Grammar eOldGrammar ); + const formula::FormulaGrammar::Grammar eNewGrammar, + const formula::FormulaGrammar::Grammar eOldGrammar ); public: /// Set external link info for ScAddress::CONV_XL_OOX. @@ -465,7 +465,7 @@ private: virtual BOOL HandleDbData(); virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef ); - virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP) + virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP); virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); |