[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Jan 15 23:09:29 PST 2011
binfilter/bf_sc/source/core/data/sc_document.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 166 +++++++++++------------
binfilter/inc/bf_sc/tabopparams.hxx | 4
binfilter/inc/bf_sch/chtscene.hxx | 4
4 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 376e4f5e40f562171f23f5704b5c0f6f8b9576e9
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jan 15 23:09:08 2011 -0800
Remove DECLARE_LIST(DescrList, E3dLabelObj*)
It was already commented out; this just makes it official.
diff --git a/binfilter/inc/bf_sch/chtscene.hxx b/binfilter/inc/bf_sch/chtscene.hxx
index 68abe08..7227c60 100644
--- a/binfilter/inc/bf_sch/chtscene.hxx
+++ b/binfilter/inc/bf_sch/chtscene.hxx
@@ -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
@@ -41,8 +41,6 @@ namespace binfilter {
|*
\************************************************************************/
-//DECLARE_LIST(DescrList, E3dLabelObj*)//STRIP008 //DECLARE_LIST(DescrList, E3dLabelObj*);
-
class ChartScene : public E3dPolyScene
{
protected:
commit 0f27e27e3cf8c0dcc1075574015d571a7954c335
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jan 15 22:57:47 2011 -0800
Remove DECLARE_LIST( ScTabOpList, ScInterpreterTableOpParams* )
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 80f0bb9..1c36935 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -1463,7 +1463,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell )
/*N*/ {
-/*N*/ ScInterpreterTableOpParams* p = aTableOpList.Last();
+/*N*/ ScInterpreterTableOpParams* p = ( aTableOpList.empty() ) ? NULL : aTableOpList.back();
/*N*/ if ( p && p->bCollectNotifications )
/*N*/ {
/*N*/ if ( p->bRefresh )
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index aab10b8..d9413a1 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.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
@@ -105,9 +105,9 @@ ScSpew ScInterpreter::theSpew;
void ScInterpreter::ReplaceCell( ScAddress& rPos )
{
- ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First();
- while (pTOp)
+ for ( size_t i = 0, n = pDok->aTableOpList.size(); i < n; ++i )
{
+ ScInterpreterTableOpParams* pTOp = pDok->aTableOpList[ i ];
if ( rPos == pTOp->aOld1 )
{
rPos = pTOp->aNew1;
@@ -118,8 +118,6 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos )
rPos = pTOp->aNew2;
return ;
}
- else
- pTOp = pDok->aTableOpList.Next();
}
}
@@ -127,9 +125,9 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos )
void ScInterpreter::ReplaceCell( USHORT& rCol, USHORT& rRow, USHORT& rTab )
{
ScAddress aCellPos( rCol, rRow, rTab );
- ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First();
- while (pTOp)
+ for ( size_t i = 0, n = pDok->aTableOpList.size(); i < n; ++i )
{
+ ScInterpreterTableOpParams* pTOp = pDok->aTableOpList[ i ];
if ( aCellPos == pTOp->aOld1 )
{
rCol = pTOp->aNew1.Col();
@@ -144,8 +142,6 @@ void ScInterpreter::ReplaceCell( USHORT& rCol, USHORT& rRow, USHORT& rTab )
rTab = pTOp->aNew2.Tab();
return ;
}
- else
- pTOp = pDok->aTableOpList.Next();
}
}
@@ -156,14 +152,13 @@ BOOL ScInterpreter::IsTableOpInRange( const ScRange& rRange )
return FALSE; // not considered to be a range in TableOp sense
// we can't replace a single cell in a range
- ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First();
- while (pTOp)
+ for ( size_t i = 0, n = pDok->aTableOpList.size(); i < n; ++i )
{
+ ScInterpreterTableOpParams* pTOp = pDok->aTableOpList[ i ];
if ( rRange.In( pTOp->aOld1 ) )
return TRUE;
if ( rRange.In( pTOp->aOld2 ) )
return TRUE;
- pTOp = pDok->aTableOpList.Next();
}
return FALSE;
}
@@ -791,7 +786,7 @@ void ScInterpreter::PopSingleRef(USHORT& rCol, USHORT &rRow, USHORT& rTab)
SetError( errNoRef ), rRow = 0;
if( rTab >= pDok->GetTableCount() || rRef.IsTabDeleted() )
SetError( errNoRef ), rTab = 0;
- if ( pDok->aTableOpList.Count() > 0 )
+ if ( !pDok->aTableOpList.empty() )
ReplaceCell( rCol, rRow, rTab );
return;
}
@@ -833,7 +828,7 @@ void ScInterpreter::PopSingleRef(USHORT& rCol, USHORT &rRow, USHORT& rTab)
/*N*/ if( nTab < 0 || nTab >= pDok->GetTableCount() || rRef.IsTabDeleted() )
/*N*/ SetError( errNoRef ), nTab = 0;
/*N*/ rAdr.Set( (USHORT)nCol, (USHORT)nRow, (USHORT)nTab );
-/*N*/ if ( pDok->aTableOpList.Count() > 0 )
+/*N*/ if ( !pDok->aTableOpList.empty() )
/*?*/ ReplaceCell( rAdr );
/*N*/ return;
/*N*/ }
@@ -900,7 +895,7 @@ void ScInterpreter::PopSingleRef(USHORT& rCol, USHORT &rRow, USHORT& rTab)
/*N*/ if( rTab2 >= nMaxTab || rRef.IsTabDeleted() )
/*N*/ SetError( errNoRef ), rTab2 = 0;
/*N*/ }
-/*N*/ if ( pDok->aTableOpList.Count() > 0 && !bDontCheckForTableOp )
+/*N*/ if ( !pDok->aTableOpList.empty() && !bDontCheckForTableOp )
/*N*/ {
/*?*/ ScRange aRange( rCol1, rRow1, rTab1, rCol2, rRow2, rTab2 );
/*?*/ if ( IsTableOpInRange( aRange ) )
@@ -972,7 +967,7 @@ void ScInterpreter::PopSingleRef(USHORT& rCol, USHORT &rRow, USHORT& rTab)
/*N*/ SetError( errNoRef ), nTab = 0;
/*N*/ rRange.aEnd.Set( (USHORT)nCol, (USHORT)nRow, (USHORT)nTab );
/*N*/ }
-/*N*/ if ( pDok->aTableOpList.Count() > 0 && !bDontCheckForTableOp )
+/*N*/ if ( !pDok->aTableOpList.empty() && !bDontCheckForTableOp )
/*N*/ {
/*?*/ if ( IsTableOpInRange( rRange ) )
/*?*/ SetError( errIllegalParameter );
@@ -1446,7 +1441,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ sal_Char* pStr[MAXFUNCPARAM];
/*?*/ BYTE* pCellArr[MAXFUNCPARAM];
/*?*/ short i;
-/*?*/
+/*?*/
/*?*/ for (i = 0; i < MAXFUNCPARAM; i++)
/*?*/ {
/*?*/ eParamType[i] = pFuncData->GetParamType(i);
@@ -1455,7 +1450,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ pStr[i] = NULL;
/*?*/ pCellArr[i] = NULL;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ for (i = nParamCount; (i > 0) && (nGlobalError == 0); i--)
/*?*/ {
/*?*/ GetStackType();
@@ -1521,7 +1516,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ }
/*?*/ while ( i-- )
/*?*/ Pop(); // im Fehlerfall (sonst ist i==0) Parameter wegpoppen
-/*?*/
+/*?*/
/*?*/ if (nGlobalError == 0)
/*?*/ {
/*?*/ if ( pFuncData->GetAsyncType() == NONE )
@@ -1601,7 +1596,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetNoValue();
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ for (i = 0; i < MAXFUNCPARAM; i++)
/*?*/ {
/*?*/ delete[] pStr[i];
@@ -1619,12 +1614,12 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*N*/ else if ( ( aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, FALSE) ).Len() )
/*N*/ {
/*N*/ // bLocalFirst=FALSE in FindFunction, cFunc should be the stored internal name
-/*N*/
+/*N*/
/*N*/ ScUnoAddInCall aCall( *ScGlobal::GetAddInCollection(), aUnoName, nParamCount );
-/*N*/
+/*N*/
/*N*/ if ( !aCall.ValidParamCount() )
/*N*/ SetError( errIllegalParameter );
-/*N*/
+/*N*/
/*N*/ if ( aCall.NeedsCaller() && !GetError() )
/*N*/ {
/*N*/ SfxObjectShell* pShell = pDok->GetDocumentShell();
@@ -1637,15 +1632,15 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ new ScDocOptionsObj( pDok->GetDocOptions() ) ) );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ short nPar = nParamCount;
/*N*/ while ( nPar && !GetError() )
/*N*/ {
/*N*/ --nPar; // 0 .. (nParamCount-1)
-/*N*/
+/*N*/
/*N*/ ScAddInArgumentType eType = aCall.GetArgType( nPar );
/*N*/ BYTE nStackType = GetStackType();
-/*N*/
+/*N*/
/*N*/ uno::Any aParam;
/*N*/ switch (eType)
/*N*/ {
@@ -1660,15 +1655,15 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*N*/ SetError(errIllegalArgument);
/*N*/ }
/*N*/ break;
-/*N*/
+/*N*/
/*?*/ case SC_ADDINARG_DOUBLE:
/*?*/ aParam <<= (double) GetDouble();
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_STRING:
/*?*/ aParam <<= ::rtl::OUString( GetString() );
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_INTEGER_ARRAY:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1707,7 +1702,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_DOUBLE_ARRAY:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1738,7 +1733,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_STRING_ARRAY:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1769,7 +1764,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_MIXED_ARRAY:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1820,7 +1815,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_VALUE_OR_ARRAY:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1864,7 +1859,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case SC_ADDINARG_CELLRANGE:
/*?*/ switch( nStackType )
/*?*/ {
@@ -1898,26 +1893,26 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ SetError(errIllegalParameter);
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ default:
/*?*/ Pop();
/*?*/ SetError(errIllegalParameter);
/*N*/ }
/*N*/ aCall.SetParam( nPar, aParam );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ while (nPar--)
/*?*/ Pop(); // in case of error, remove remaining args
-/*N*/
+/*N*/
/*N*/ if ( !GetError() )
/*N*/ {
/*N*/ aCall.ExecuteCall();
-/*N*/
+/*N*/
/*N*/ if ( aCall.HasVarRes() ) // handle async functions
/*N*/ {
/*?*/ if ( pMyFormulaCell->GetCode()->IsRecalcModeNormal() )
/*?*/ pMyFormulaCell->GetCode()->SetRecalcModeOnLoad();
-/*?*/
+/*?*/
/*?*/ uno::Reference<sheet::XVolatileResult> xResult = aCall.GetVarRes();
/*?*/ ScAddInListener* pLis = ScAddInListener::Get( xResult );
/*?*/ if ( !pLis )
@@ -1932,10 +1927,10 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*?*/ if ( !pLis->HasDocument( pDok ) )
/*?*/ pLis->AddDocument( pDok );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ aCall.SetResult( pLis->GetResult() ); // use result from async
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( aCall.GetErrCode() )
/*N*/ {
/*?*/ SetError( aCall.GetErrCode() );
@@ -1944,7 +1939,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*N*/ else if ( aCall.HasMatrix() )
/*N*/ {
/*?*/ const ScMatrix* pLinkMat = aCall.GetMatrix(); // not NULL
-/*?*/
+/*?*/
/*?*/ USHORT nC, nR, nMatInd; // copy matrix result
/*?*/ pLinkMat->GetDimensions(nC, nR);
/*?*/ ScMatrix* pNewMat = GetNewMat( nC, nR, nMatInd );
@@ -1982,29 +1977,29 @@ void ScInterpreter::ScMissing()
/*N*/ void ScInterpreter::ScMacro()
/*N*/ {
/*N*/ SbxBase::ResetError();
-/*N*/
+/*N*/
/*N*/ BYTE nParamCount = GetByte();
/*N*/ String aMacro( pCur->GetExternal() );
-/*N*/
+/*N*/
/*N*/ SfxObjectShell* pDocSh = pDok->GetDocumentShell();
/*N*/ if ( !pDocSh || !pDok->CheckMacroWarn() )
/*N*/ {
/*N*/ SetError( errNoValue ); // ohne DocShell kein CallBasic
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic
-/*N*/
+/*N*/
/*N*/ SfxApplication* pSfxApp = SFX_APP();
/*N*/ pSfxApp->EnterBasicCall(); // Dok-Basic anlegen etc.
-/*N*/
+/*N*/
/*N*/ // Wenn das Dok waehrend eines Basic-Calls geladen wurde,
/*N*/ // ist das Sbx-Objekt evtl. nicht angelegt (?)
/*N*/ // pDocSh->GetSbxObject();
-/*N*/
+/*N*/
/*N*/ // Funktion ueber den einfachen Namen suchen,
/*N*/ // dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen
-/*N*/
+/*N*/
/*N*/ StarBASIC* pRoot = pDocSh->GetBasic();
/*N*/ SbxVariable* pVar = pRoot->Find( aMacro, SbxCLASS_METHOD );
/*N*/ if( !pVar || pVar->GetType() == SbxVOID || !pVar->ISA(SbMethod) )
@@ -2013,7 +2008,7 @@ void ScInterpreter::ScMissing()
/*?*/ pSfxApp->LeaveBasicCall();
/*?*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SbMethod* pMethod = (SbMethod*)pVar;
/*N*/ SbModule* pModule = pMethod->GetModule();
/*N*/ SbxObject* pObject = pModule->GetParent();
@@ -2028,9 +2023,9 @@ void ScInterpreter::ScMissing()
/*N*/ aBasicStr = pObject->GetParent()->GetName(); // Dokumentenbasic
/*N*/ else
/*?*/ aBasicStr = SFX_APP()->GetName(); // Applikationsbasic
-/*N*/
+/*N*/
/*N*/ // Parameter-Array zusammenbauen
-/*N*/
+/*N*/
/*N*/ SbxArrayRef refPar = new SbxArray;
/*N*/ BOOL bOk = TRUE;
/*N*/ for( short i = nParamCount; i && bOk ; i-- )
@@ -2127,7 +2122,7 @@ void ScInterpreter::ScMissing()
/*N*/ ErrCode eRet = pDocSh->CallBasic( aMacroStr, aBasicStr, NULL, refPar, refRes );
/*N*/ pDok->DecMacroInterpretLevel();
/*N*/ pDok->UnlockTable( aPos.Tab() );
-/*N*/
+/*N*/
/*N*/ SbxDataType eResType = refRes->GetType();
/*N*/ if ( eRet != ERRCODE_NONE )
/*N*/ SetNoValue();
@@ -2195,7 +2190,7 @@ void ScInterpreter::ScMissing()
/*N*/ if( pVar->GetError() )
/*?*/ SetNoValue();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ pSfxApp->LeaveBasicCall();
/*N*/ }
@@ -2274,11 +2269,11 @@ void ScInterpreter::ScMissing()
/*N*/ PopSingleRef( pTableOp->aNew1 );
/*N*/ PopSingleRef( pTableOp->aOld1 );
/*N*/ PopSingleRef( pTableOp->aFormulaPos );
-/*N*/
+/*N*/
/*N*/ pTableOp->bValid = TRUE;
-/*N*/ pDok->aTableOpList.Insert( pTableOp );
+/*N*/ pDok->aTableOpList.push_back( pTableOp );
/*N*/ pDok->IncInterpreterTableOpLevel();
-/*N*/
+/*N*/
/*N*/ BOOL bReuseLastParams = (pDok->aLastTableOpParams == *pTableOp);
/*N*/ if ( bReuseLastParams )
/*N*/ {
@@ -2301,7 +2296,7 @@ void ScInterpreter::ScMissing()
/*N*/ pDok->SetTableOpDirty( pTableOp->aOld2 );
/*N*/ }
/*N*/ pTableOp->bCollectNotifications = FALSE;
-/*N*/
+/*N*/
/*N*/ ScBaseCell* pFCell = pDok->GetCell( pTableOp->aFormulaPos );
/*N*/ if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA )
/*N*/ ((ScFormulaCell*)pFCell)->SetDirtyVar();
@@ -2313,8 +2308,15 @@ void ScInterpreter::ScMissing()
/*N*/ GetCellString( aCellString, pFCell );
/*N*/ PushString( aCellString );
/*N*/ }
-/*N*/
-/*N*/ pDok->aTableOpList.Remove( pTableOp );
+/*N*/
+ for ( ScTabOpList::iterator it = pDok->aTableOpList.begin(); it < pDok->aTableOpList.end(); ++it )
+ {
+ if ( *it == pTableOp )
+ {
+ pDok->aTableOpList.erase( it );
+ break;
+ }
+ }
/*N*/ // set dirty again once more to be able to recalculate original
/*N*/ for ( ::std::vector< ScFormulaCell* >::const_iterator iBroadcast(
/*N*/ pTableOp->aNotifiedFormulaCells.begin() );
@@ -2323,17 +2325,17 @@ void ScInterpreter::ScMissing()
/*N*/ {
/*N*/ (*iBroadcast)->SetTableOpDirty();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // save these params for next incarnation
/*N*/ if ( !bReuseLastParams )
/*N*/ pDok->aLastTableOpParams = *pTableOp;
-/*N*/
+/*N*/
/*N*/ if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA )
/*N*/ {
/*N*/ ((ScFormulaCell*)pFCell)->SetDirtyVar();
/*N*/ ((ScFormulaCell*)pFCell)->GetErrCode(); // recalculate original
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Reset all dirty flags so next incarnation does really collect all cell
/*N*/ // pointers during notifications and not just non-dirty ones, which may
/*N*/ // happen if a formula cell is used by more than one TableOp block.
@@ -2345,7 +2347,7 @@ void ScInterpreter::ScMissing()
/*N*/ (*iBroadcast2)->ResetTableOpDirtyVar();
/*N*/ }
/*N*/ delete pTableOp;
-/*N*/
+/*N*/
/*N*/ pDok->DecInterpreterTableOpLevel();
/*N*/ }
@@ -2523,11 +2525,11 @@ void ScInterpreter::ScSpewFunc()
}
-/*N*/
+/*N*/
/*N*/ //#define SC_INVADER_GPF // GPF wollen wir nicht :-(
/*N*/ // zum testen Environment-Variable SC_INVADER_GPF=xxx setzen
/*N*/ // 08.10.98: wenn PB optpath.cxx gefixt hat geht's wieder
-/*N*/
+/*N*/
/*N*/ extern void StartInvader( Window* pParent ); // StarWars, Wrapper in SVX options/optpath.cxx
/*N*/ extern void Game(); // Froggie
@@ -2579,7 +2581,7 @@ void ScInterpreter::ScTTT()
/*N*/ bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() )
/*N*/ {
/*N*/ // pStack = new ScToken*[ MAXSTACK ];
-/*N*/
+/*N*/
/*N*/ BYTE cMatFlag = pMyFormulaCell->GetMatrixFlag();
/*N*/ bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE );
/*N*/ if (!bGlobalStackInUse)
@@ -2605,7 +2607,7 @@ void ScInterpreter::ScTTT()
/*N*/ ScInterpreter::~ScInterpreter()
/*N*/ {
/*N*/ // delete pStack;
-/*N*/
+/*N*/
/*N*/ if ( pStackObj == pGlobalStack )
/*N*/ bGlobalStackInUse = FALSE;
/*N*/ else
@@ -2631,7 +2633,7 @@ void ScInterpreter::ScTTT()
/*N*/ USHORT nErrorFunction = 0;
/*N*/ USHORT nErrorFunctionCount = 0;
/*N*/ USHORT nStackBase;
-/*N*/
+/*N*/
/*N*/ nGlobError = nGlobalError;
/*N*/ nGlobalError = 0;
/*N*/ nMatCount = 0;
@@ -2646,7 +2648,7 @@ void ScInterpreter::ScTTT()
/*N*/ eResult = svDouble;
/*N*/ glSubTotal = FALSE;
/*N*/ UINT16 nOldOpCode = ocStop;
-/*N*/
+/*N*/
// Once upon a time we used to have FP exceptions on, and there was a
// Windows printer driver that kept switching off exceptions, so we had to
// switch them back on again every time. Who knows if there isn't a driver
@@ -2674,14 +2676,14 @@ void ScInterpreter::ScTTT()
/*N*/ // default Funtionsformat, andere werden bei Bedarf gesetzt
/*N*/ nFuncFmtType = NUMBERFORMAT_NUMBER;
/*N*/ nFuncFmtIndex = 0;
-/*N*/
+/*N*/
/*N*/ if ( eOp == ocIf || eOp == ocChose )
/*N*/ nStackBase = sp; // nicht die Jumps vertueddeln
/*N*/ else
/*N*/ nStackBase = sp - pCur->GetParamCount();
/*N*/ if ( nStackBase > sp )
/*N*/ nStackBase = sp; // underflow?!?
-/*N*/
+/*N*/
/*N*/ switch( eOp )
/*N*/ {
case ocSep:
@@ -2988,7 +2990,7 @@ void ScInterpreter::ScTTT()
case ocGame : ScGame(); break;
/*N*/ default : SetError(errUnknownOpCode); PushInt(0); break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // aeussere Funktion bestimmt das Format eines Ausdrucks
/*N*/ if ( nFuncFmtType != NUMBERFORMAT_UNDEFINED )
/*N*/ {
@@ -2998,7 +3000,7 @@ void ScInterpreter::ScTTT()
/*N*/ nFuncFmtIndex : 0 );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Funktionen, die einen Fehlercode auswerten und nGlobalError direkt auf 0 setzen
/*N*/ // usage: switch( OpCode ) { OCERRFUNCCASE( ++n ) }
/*N*/ #define CASEOCERRFUNC( statement ) \
@@ -3016,7 +3018,7 @@ void ScInterpreter::ScTTT()
/*N*/ case ocN : \
/*N*/ case ocType : \
/*N*/ statement;
-/*N*/
+/*N*/
/*N*/ switch ( eOp )
/*N*/ {
/*N*/ CASEOCERRFUNC( ++nErrorFunction )
@@ -3048,12 +3050,12 @@ void ScInterpreter::ScTTT()
/*?*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ nOldOpCode = eOp;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Ende: Returnwert holen
-/*N*/
+/*N*/
/*N*/ if( sp )
/*N*/ {
/*N*/ pCur = pStack[ sp-1 ];
@@ -3176,7 +3178,7 @@ void ScInterpreter::ScTTT()
/*N*/ }
/*N*/ else
/*N*/ SetError(errNoCode);
-/*N*/
+/*N*/
/*N*/ if (!::rtl::math::isFinite(nResult))
/*N*/ {
/*N*/ if ( ::rtl::math::isNan( nResult ) )
@@ -3185,7 +3187,7 @@ void ScInterpreter::ScTTT()
/*N*/ SetError(errIllegalFPOperation);
/*N*/ nResult = 0.0;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( nRetTypeExpr != NUMBERFORMAT_UNDEFINED )
/*N*/ {
/*N*/ nRetFmtType = nRetTypeExpr;
@@ -3201,12 +3203,12 @@ void ScInterpreter::ScTTT()
/*N*/ // nur fuer Waehrungsformate den FormatIndex uebernehmen
/*N*/ if ( nRetFmtType != NUMBERFORMAT_CURRENCY )
/*N*/ nRetFmtIndex = 0;
-/*N*/
+/*N*/
/*N*/ // grrr.. EiterZirkel!
/*N*/ // Fehler nur zuruecksetzen wenn nicht errCircularReference ohne Iterationen
/*N*/ if ( nGlobalError || !(rArr.GetError() == errCircularReference && !pDok->GetDocOptions().IsIter()) )
/*N*/ rArr.SetError( nGlobalError );
-/*N*/
+/*N*/
/*N*/ if (ppGlobSortArray)
/*?*/ #ifdef WIN
/*?*/ SvMemFree(*ppGlobSortArray);
diff --git a/binfilter/inc/bf_sc/tabopparams.hxx b/binfilter/inc/bf_sc/tabopparams.hxx
index 25f63ad..49868cf 100644
--- a/binfilter/inc/bf_sc/tabopparams.hxx
+++ b/binfilter/inc/bf_sc/tabopparams.hxx
@@ -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
@@ -98,7 +98,7 @@ struct ScInterpreterTableOpParams
}
};
-DECLARE_LIST( ScTabOpList, ScInterpreterTableOpParams* )//STRIP008 DECLARE_LIST( ScTabOpList, ScInterpreterTableOpParams* );
+typedef ::std::vector< ScInterpreterTableOpParams* > ScTabOpList;
} //namespace binfilter
#endif // SC_TABOPPARAMS_HXX
More information about the Libreoffice-commits
mailing list