diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:50:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:50:09 +0000 |
| commit | 55cb991276a12f9e62aae0369402472c9e72ba6e (patch) | |
| tree | 5f7fcd55959ef26b09d3cfd05f587199220e6d39 /sc | |
| parent | b7b5578fbd6504fe0ffde1273abf3bcc10d0527d (diff) | |
INTEGRATION: CWS koheiformula01 (1.41.12); FILE MERGED
2008/04/23 15:10:35 kohei 1.41.12.3: RESYNC: (1.41-1.42); FILE MERGED
2008/03/20 23:19:42 kohei 1.41.12.2: Use the current address convention everywhere instead of always using the OOo convention.
2008/03/19 17:37:08 kohei 1.41.12.1: changed a lot of places to prepare for a single global grammar value that applies to all places where formulas are used.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/cell.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index de6456123350..eb1f713488b5 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cell.cxx,v $ - * $Revision: 1.42 $ + * $Revision: 1.43 $ * * This file is part of OpenOffice.org. * @@ -907,7 +907,7 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening ) if( !bNoListening && pCode->GetCodeLen() ) EndListeningTo( pDocument ); - ScCompiler aComp(pDocument, aPos, *pCode ); + ScCompiler aComp(pDocument, aPos, *pCode, pDocument->GetGrammar()); bSubTotal = aComp.CompileTokenArray(); if( !pCode->GetCodeError() ) { @@ -994,7 +994,7 @@ void ScFormulaCell::CalcAfterLoad() // wurde, da die RangeNames erst jetzt existieren. if( pCode->GetLen() && !pCode->GetCodeLen() && !pCode->GetCodeError() ) { - ScCompiler aComp(pDocument, aPos, *pCode); + ScCompiler aComp(pDocument, aPos, *pCode, pDocument->GetGrammar()); bSubTotal = aComp.CompileTokenArray(); nFormatType = aComp.GetNumFormatType(); nFormatIndex = 0; @@ -1085,7 +1085,8 @@ void ScFormulaCell::Interpret() aDebugVec.push_back( aR); } String aStr; - pCell->aPos.Format( aStr, SCA_VALID | SCA_TAB_3D, pCell->GetDocument()); + pCell->aPos.Format( aStr, SCA_VALID | SCA_TAB_3D, pCell->GetDocument(), + pCell->GetDocument()->GetAddressConvention() ); ByteString aB( aStr, RTL_TEXTENCODING_UTF8); aDebugVec.push_back( aB); } |