diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 15:22:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 15:22:50 +0000 |
| commit | 22047757033ef5e658adc721a310be96ff046a0e (patch) | |
| tree | 2d183160aac61fb962bf68a6664a2bc4d732cf41 /sc | |
| parent | d4b50d3da5a01d326e1006755d5150f726e52142 (diff) | |
INTEGRATION: CWS odff (1.39.4); FILE MERGED
2008/02/27 18:35:28 er 1.39.4.3: RESYNC: (1.39-1.40); FILE MERGED
2008/02/15 14:23:08 er 1.39.4.2: #i81063# grammar here, grammar there, grammar everywhere
2008/01/25 14:19:42 er 1.39.4.1: #i32340# ScFormulaResult, start differentiating between compiler/code token error and interpreter/result error; make iterations work with result errors
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index f22985f98575..f493157918fd 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewfunc.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2008-02-19 15:42:20 $ + * last change: $Author: kz $ $Date: 2008-03-06 16:22:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -482,7 +482,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS { // probieren, mit erster Parser-Korrektur neu zu parsen pArr = aComp.CompileString( aComp.GetCorrectedFormula() ); } - if ( !pArr->GetError() ) + if ( !pArr->GetCodeError() ) { bAddEqual = TRUE; aComp.CompileTokenArray(); @@ -533,7 +533,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS // Zellen RPN geloescht und der Fehler explizit gesetzt werden, da // via FormulaCell copy-ctor und Interpreter das, wenn moeglich, // wieder glattgebuegelt wird, zu intelligent.. z.B.: =1)) - USHORT nError = pArr->GetError(); + USHORT nError = pArr->GetCodeError(); if ( !nError ) { // #68693# update list of recent functions with all functions that @@ -566,7 +566,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS } } - ScFormulaCell aCell( pDoc, aPos, pArr, 0 ); + ScFormulaCell aCell( pDoc, aPos, pArr, ScGrammar::GRAM_DEFAULT, MM_NONE ); delete pArr; BOOL bAutoCalc = pDoc->GetAutoCalc(); SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); @@ -867,7 +867,7 @@ void ScViewFunc::EnterMatrix( const String& rString ) SCCOL nCol = pData->GetCurX(); SCROW nRow = pData->GetCurY(); SCTAB nTab = pData->GetTabNo(); - ScFormulaCell aFormCell( pDoc, ScAddress(nCol,nRow,nTab), rString, ScAddress::CONV_UNSPECIFIED, MM_FORMULA ); + ScFormulaCell aFormCell( pDoc, ScAddress(nCol,nRow,nTab), rString, ScGrammar::GRAM_DEFAULT, MM_FORMULA ); SCSIZE nSizeX; SCSIZE nSizeY; @@ -887,7 +887,7 @@ void ScViewFunc::EnterMatrix( const String& rString ) if (pData->GetSimpleArea(aRange)) { ScDocShell* pDocSh = pData->GetDocShell(); - BOOL bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, NULL, rString, FALSE, FALSE ); + BOOL bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, NULL, rString, FALSE, FALSE, ScGrammar::GRAM_DEFAULT ); if (bSuccess) pDocSh->UpdateOle(GetViewData()); } |