[Libreoffice-commits] .: binfilter/bf_sc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jan 9 06:18:29 PST 2011
binfilter/bf_sc/source/core/data/sc_cell.cxx | 89 +++++++++++++--------------
1 file changed, 43 insertions(+), 46 deletions(-)
New commits:
commit 8aa0ce791ab071a78a117ed6608763576d7f1578
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 06:18:25 2011 -0800
Remove DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 9aa1a43..b0265d1 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -102,9 +102,6 @@ static const sal_Char msgDbgInfinity[] =
// -----------------------------------------------------------------------
-DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
-
-
/*N*/ ScBaseCell* ScBaseCell::Clone(ScDocument* pDoc) const
/*N*/ {
/*N*/ switch (eCellType)
@@ -178,7 +175,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ rNote = *pNote;
/*N*/ else
/*?*/ rNote.Clear();
-/*N*/
+/*N*/
/*N*/ return ( pNote != NULL );
/*N*/ }
@@ -210,7 +207,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*M*/ )
/*M*/ {
/*M*/ pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert...
-/*M*/
+/*M*/
/*M*/ ScFormulaCell* pFormCell = (ScFormulaCell*)this;
/*M*/ ScTokenArray* pArr = pFormCell->GetCode();
/*M*/ if( pArr->IsRecalcModeAlways() )
@@ -307,7 +304,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ )
/*N*/ {
/*N*/ pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert...
-/*N*/
+/*N*/
/*N*/ ScFormulaCell* pFormCell = (ScFormulaCell*)this;
/*N*/ if( pFormCell->GetCode()->IsRecalcModeAlways() )
/*?*/ pDoc->EndListeningArea( BCA_LISTEN_ALWAYS, pFormCell );
@@ -469,7 +466,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ }
/*N*/ if ( eType1 != eType2 )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ switch ( eType1 ) // beide Typen gleich
/*N*/ {
/*N*/ case CELLTYPE_NONE: // beide leer
@@ -496,10 +493,10 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ //! eingefuegte Zeilen / Spalten beruecksichtigen !!!!!
/*N*/ //! Vergleichsfunktion an der Formelzelle ???
/*N*/ //! Abfrage mit ScColumn::SwapRow zusammenfassen!
-/*N*/
+/*N*/
/*N*/ ScTokenArray* pCode1 = ((ScFormulaCell*)pCell1)->GetCode();
/*N*/ ScTokenArray* pCode2 = ((ScFormulaCell*)pCell2)->GetCode();
-/*N*/
+/*N*/
/*N*/ if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN
/*N*/ {
/*N*/ BOOL bEqual = TRUE;
@@ -512,11 +509,11 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ bEqual = FALSE;
/*N*/ break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (bEqual)
/*N*/ return TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return FALSE; // unterschiedlich lang oder unterschiedliche Tokens
/*N*/ }
/*N*/ default:
@@ -633,10 +630,10 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ else
/*N*/ pMatrix = NULL;
/*N*/ pCode = rScFormulaCell.pCode->Clone();
-/*N*/
+/*N*/
/*N*/ if ( nCopyFlags & 0x0001 )
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pCode->ReadjustRelative3DReferences( rScFormulaCell.aPos, aPos );
-/*N*/
+/*N*/
/*N*/ // evtl. Fehler zuruecksetzen und neu kompilieren
/*N*/ // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben
/*N*/ // Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler behalten
@@ -719,9 +716,9 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ {
/*N*/ // ScReadHeader aHdr( rStream );
/*N*/ rHdr.StartEntry();
-/*N*/
+/*N*/
/*N*/ USHORT nVer = (USHORT) pDoc->GetSrcVersion();
-/*N*/
+/*N*/
/*N*/ if( nVer >= SC_NUMFMT )
/*N*/ {
/*N*/ BYTE cData;
@@ -789,9 +786,9 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ // Wir koennen hier bei Calc 3.0-Docs noch kein UPN-Array
/*N*/ // erzeugen, da die Named Ranges noch nicht eingelesen sind
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rHdr.EndEntry();
-/*N*/
+/*N*/
/*N*/ // after loading, it must be known if ocMacro is in any formula
/*N*/ // (for macro warning, and to insert the hidden view)
/*N*/ if ( !pDoc->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) )
@@ -817,7 +814,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ {
/*?*/ // Zelle mit Ref-Error erzeugen und speichern
/*?*/ // StartEntry/EndEntry passiert beim Speichern der neuen Zelle
-/*?*/
+/*?*/
/*?*/ SingleRefData aRef;
/*?*/ aRef.InitAddress(ScAddress());
/*?*/ aRef.SetColRel(TRUE);
@@ -831,13 +828,13 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*?*/ ScFormulaCell* pErrCell = new ScFormulaCell( pDocument, aPos, &aArr );
/*?*/ pErrCell->Save( rStream, rHdr );
/*?*/ delete pErrCell;
-/*?*/
+/*?*/
/*?*/ pDocument->SetLostData(); // Warnung ausgeben
/*?*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rHdr.StartEntry();
-/*N*/
+/*N*/
/*N*/ if ( bIsValue && !pCode->GetError() && !::rtl::math::isFinite( nErgValue ) )
/*N*/ {
/*N*/ DBG_ERRORFILE( msgDbgInfinity );
@@ -872,7 +869,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ pCode->Store( rStream, aPos );
/*N*/ if ( cMatrixFlag == MM_FORMULA )
/*N*/ rStream << nMatCols << nMatRows;
-/*N*/
+/*N*/
/*N*/ rHdr.EndEntry();
/*N*/ }
@@ -928,7 +925,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ ScCompiler aComp( pDocument, aPos, *pCode );
/*N*/ aComp.CreateStringFromTokenArray( rFormula );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rFormula.Insert( '=',0 );
/*N*/ if( cMatrixFlag )
/*N*/ {
@@ -984,11 +981,11 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ BOOL bWasInFormulaTree = pDocument->IsInFormulaTree( this );
/*N*/ if ( bWasInFormulaTree )
/*?*/ pDocument->RemoveFromFormulaTree( this );
-/*N*/
+/*N*/
/*N*/ // Laden aus Filter? Dann noch nix machen!
/*N*/ if( pDocument->IsInsertingFromOtherDoc() )
/*N*/ bNoListening = TRUE;
-/*N*/
+/*N*/
/*N*/ if( !bNoListening && pCode->GetCodeLen() )
/*?*/ EndListeningTo( pDocument );
/*N*/ ScCompiler aComp(pDocument, aPos, *pCode );
@@ -1018,7 +1015,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ StartListeningTo( pDocument );
/*N*/ return ;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ ScCompiler aComp( pDocument, aPos, *pCode );
/*N*/ aComp.SetCompileEnglish( TRUE );
/*N*/ aComp.SetImportXML( TRUE );
@@ -1054,7 +1051,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ SetTextWidth( TEXTWIDTH_DIRTY );
/*N*/ SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Same as in Load: after loading, it must be known if ocMacro is in any formula
/*N*/ // (for macro warning, CompileXML is called at the end of loading XML file)
/*N*/ if ( !pDocument->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) )
@@ -1134,14 +1131,14 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ static ScFormulaCell* pLastIterInterpreted = NULL;
/*N*/ if ( !IsDirtyOrInTableOpDirty() )
/*N*/ return; // fuer IterCircRef, nix doppelt
-/*N*/
+/*N*/
/*N*/ //! HACK:
/*N*/ // Wenn der Aufruf aus einem Reschedule im DdeLink-Update kommt, dirty stehenlassen
/*N*/ // Besser: Dde-Link Update ohne Reschedule oder ganz asynchron !!!
-/*N*/
+/*N*/
/*N*/ if ( pDocument->IsInDdeLinkUpdate() )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ if (bRunning)
/*N*/ {
/*N*/ // Keine Iterierung?
@@ -1160,7 +1157,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ // #63038# fuer GetErrCode, IsValue, GetValue nicht mehrfach interpretieren
/*N*/ if ( nIterMode && pLastIterInterpreted == this )
/*N*/ return ;
-/*N*/
+/*N*/
/*N*/ if( !pCode->GetCodeLen() && !pCode->GetError() )
/*N*/ {
/*N*/ // #i11719# no UPN and no error and no token code but result string present
@@ -1180,7 +1177,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ }
/*?*/ CompileTokenArray();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( pCode->GetCodeLen() && pDocument )
/*N*/ {
/*N*/ #if defined(MAC) && !defined(SIMPLEMAXRECURSION)
@@ -1227,7 +1224,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*?*/ delete pMatrix;
/*?*/ pMatrix = NULL;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ switch ( pCode->GetError() )
/*N*/ {
/*?*/ case errCircularReference : // wird neu festgestellt
@@ -1235,7 +1232,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*?*/ pCode->SetError( 0 );
/*?*/ break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ bRunning = TRUE;
/*N*/ p->Interpret();
/*N*/ bRunning = FALSE;
@@ -1288,7 +1285,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ else
/*N*/ bRepeat = FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ switch( p->GetResultType() )
/*N*/ {
/*N*/ case svDouble:
@@ -1308,7 +1305,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ }
/*N*/ break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Neuer Fehlercode?
/*N*/ if( !bChanged && pCode->GetError() != nOldErrCode )
/*N*/ bChanged = TRUE;
@@ -1373,14 +1370,14 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ;
/*N*/ pCode->SetError( errIllegalFPOperation );
/*N*/ }
/*N*/ #endif
-/*N*/
+/*N*/
/*N*/ // FORCED Zellen auch sofort auf Gueltigkeit testen (evtl. Makro starten)
-/*N*/
+/*N*/
/*N*/ if ( pCode->IsRecalcModeForced() )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUInt32Item*) pDocument->GetAttr(
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
/*N*/ ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
/*N*/ pDocument->GetFormulaCodeInTree() );
@@ -1529,18 +1526,18 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUI
/*N*/ BOOL ScDetectiveRefIter::GetNextRef( ScTripel& rStart, ScTripel& rEnd )
/*N*/ {
/*N*/ BOOL bRet = FALSE;
-/*N*/
+/*N*/
/*N*/ ScToken* p = pCode->GetNextReferenceRPN();
/*N*/ if (p)
/*N*/ p->CalcAbsIfRel( aPos );
-/*N*/
+/*N*/
/*N*/ while ( p && lcl_ScDetectiveRefIter_SkipRef( p ) )
/*N*/ {
/*N*/ p = pCode->GetNextReferenceRPN();
/*N*/ if (p)
/*N*/ p->CalcAbsIfRel( aPos );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( p )
/*N*/ {
/*N*/ SingleDoubleRefProvider aProv( *p );
@@ -1552,7 +1549,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUI
/*N*/ aProv.Ref2.nTab );
/*N*/ bRet = TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return bRet;
/*N*/ }
@@ -1571,7 +1568,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUI
/*N*/ #ifdef DBG_UTIL
-/*N*/
+/*N*/
/*N*/ ScStringCell::~ScStringCell()
/*N*/ {
/*N*/ eCellType = CELLTYPE_DESTROYED;
@@ -1586,7 +1583,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUI
/*N*/ }
/*N*/ #ifdef DBG_UTIL
-/*N*/
+/*N*/
/*N*/ ScNoteCell::~ScNoteCell()
/*N*/ {
/*N*/ eCellType = CELLTYPE_DESTROYED;
More information about the Libreoffice-commits
mailing list