[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Jan 2 13:20:52 PST 2011
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 10
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 4
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 6
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 156 ++++++++-------
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 46 ++--
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 53 -----
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 24 +-
binfilter/bf_sc/source/core/tool/sc_ddelink.cxx | 8
binfilter/bf_sc/source/core/tool/sc_detdata.cxx | 13 -
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 5
binfilter/bf_sc/source/core/tool/sc_docoptio.cxx | 8
binfilter/bf_sc/source/core/tool/sc_editutil.cxx | 14 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 234 ++++++++++++-----------
binfilter/bf_sc/source/core/tool/sc_interpr3.cxx | 134 ++++++-------
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 8
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx | 29 +-
binfilter/bf_sc/source/core/tool/sc_rangelst.cxx | 46 ++--
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 12 -
binfilter/bf_sc/source/core/tool/sc_token.cxx | 11 -
binfilter/bf_sc/source/core/tool/sc_unitconv.cxx | 6
binfilter/bf_sc/source/core/tool/sc_userlist.cxx | 8
binfilter/bf_sc/source/core/tool/sc_zforauto.cxx | 8
binfilter/inc/bf_sc/compiler.hxx | 1
23 files changed, 426 insertions(+), 418 deletions(-)
New commits:
commit e747c3101019a0a946bf463e8e44b9d8e405df67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 2 21:20:38 2011 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index e09c97f..4c5565f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -150,16 +150,16 @@ public:
/*N*/ long nAC, const ScAddInArgDesc* pAD,
/*N*/ long nCP ) :
/*N*/ aOriginalName( rNam ),
-/*N*/ aUpperName( rNam ),
/*N*/ aLocalName( rLoc ),
+/*N*/ aUpperName( rNam ),
/*N*/ aUpperLocal( rLoc ),
/*N*/ aDescription( rDesc ),
-/*N*/ nCategory( nCat ),
-/*N*/ nHelpId( nHelp ),
/*N*/ xFunction( rFunc ),
/*N*/ aObject( rO ),
/*N*/ nArgCount( nAC ),
/*N*/ nCallerPos( nCP ),
+/*N*/ nCategory( nCat ),
+/*N*/ nHelpId( nHelp ),
/*N*/ bCompInitialized( FALSE )
/*N*/ {
/*N*/ if ( nArgCount )
@@ -684,11 +684,11 @@ public:
/*N*/ ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const String& rName,
/*N*/ long nParamCount ) :
+/*N*/ bValidCount( FALSE ),
/*N*/ nErrCode( errNoCode ), // before function was called
/*N*/ bHasString( TRUE ),
/*N*/ fValue( 0.0 ),
-/*N*/ pMatrix( NULL ),
-/*N*/ bValidCount( FALSE )
+/*N*/ pMatrix( NULL )
/*N*/ {
/*N*/ pFuncData = rColl.GetFuncData( rName );
/*N*/ DBG_ASSERT( pFuncData, "Function Data missing" );
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index b63298c..6a56549 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -48,7 +48,7 @@ namespace binfilter {
//------------------------------------------------------------------------
-sal_Char *linker_dummy = "";
+const sal_Char *linker_dummy = "";
// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
//static const sal_Char cStandardName[] = "Standard";
@@ -412,11 +412,11 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ ScAutoFormatData::ScAutoFormatData( const ScAutoFormatData& rData ) :
/*N*/ aName( rData.aName ),
/*N*/ nStrResId( rData.nStrResId ),
-/*N*/ bIncludeValueFormat( rData.bIncludeValueFormat ),
/*N*/ bIncludeFont( rData.bIncludeFont ),
/*N*/ bIncludeJustify( rData.bIncludeJustify ),
/*N*/ bIncludeFrame( rData.bIncludeFrame ),
/*N*/ bIncludeBackground( rData.bIncludeBackground ),
+/*N*/ bIncludeValueFormat( rData.bIncludeValueFormat ),
/*N*/ bIncludeWidthHeight( rData.bIncludeWidthHeight )
/*N*/ {
/*N*/ ppDataField = new ScAutoFormatDataField*[ 16 ];
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index de87adf..d65cb26 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -126,9 +126,9 @@ typedef void (CALLTYPE* FARPROC) ( void );
/*N*/ }
-/*N*/ short FuncCollection::Compare(DataObject* pKey1, DataObject* pKey2) const
+/*N*/ short FuncCollection::Compare(DataObject*, DataObject*) const
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 return (short) ScGlobal::pTransliteration->compareString(
+ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
/*N*/ BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const
@@ -161,7 +161,7 @@ public:
/*N*/
/*N*/ virtual DataObject* Clone() const { return new ModuleCollection(*this); }
/*N*/ ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
- virtual short Compare(DataObject* pKey1, DataObject* pKey2) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
+ virtual short Compare(DataObject*, DataObject*) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ };
/*N*/ #ifdef _MSC_VER
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 3fb3f47..b8a8378 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -93,6 +93,9 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ const String& aTempUser, const String& aTempComment)
/*N*/ :
/*N*/ aBigRange( rRange ),
+/*N*/ aDateTime( aTempDateTime ),
+/*N*/ aUser( aTempUser ),
+/*N*/ aComment( aTempComment ),
/*N*/ pNext( NULL ),
/*N*/ pPrev( NULL ),
/*N*/ pLinkAny( NULL ),
@@ -102,10 +105,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ nAction( nTempAction ),
/*N*/ nRejectAction( nTempRejectAction ),
/*N*/ eType( eTypeP ),
-/*N*/ eState( eTempState ),
-/*N*/ aDateTime( aTempDateTime ),
-/*N*/ aUser( aTempUser ),
-/*N*/ aComment( aTempComment )
+/*N*/ eState( eTempState )
/*N*/ {
/*N*/ }
@@ -449,10 +449,10 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ if ( !pE->pContent->IsDeletedIn() &&
/*N*/ pE->pContent->GetBigRange().aStart.IsValid( pDoc ) )
/*N*/ pE->pContent->PutNewValueToDoc( pDoc, nDx, nDy );
-/*N*/ ScChangeActionCellListEntry* pNext;
-/*N*/ pNext = pE->pNext;
+/*N*/ ScChangeActionCellListEntry* pLclNext;
+/*N*/ pLclNext = pE->pNext;
/*N*/ delete pE;
-/*N*/ pE = pNext;
+/*N*/ pE = pLclNext;
/*N*/ }
/*N*/ DeleteCellEntries(); // weg mit den generierten
/*N*/ }
@@ -555,7 +555,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
/*N*/ rStrm << nCount;
/*N*/ ScChangeActionLinkEntry* pHere;
-/*N*/ while ( pHere = (ScChangeActionLinkEntry*) pStack->Pop() )
+/*N*/ while (( pHere = (ScChangeActionLinkEntry*) pStack->Pop() ))
/*N*/ {
/*N*/ ScChangeAction* p = pHere->GetAction();
/*N*/ rStrm << (UINT32) ( p ? p->GetActionNumber() : 0 );
@@ -713,11 +713,11 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ {
/*N*/ }
-/*N*/ ScChangeActionIns::ScChangeActionIns(const ULONG nActionNumber, const ScChangeActionState eState, const ULONG nRejectingNumber,
-/*N*/ const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, const String& sComment,
-/*N*/ const ScChangeActionType eType)
+/*N*/ ScChangeActionIns::ScChangeActionIns(const ULONG nActionNumber, const ScChangeActionState eInState, const ULONG nRejectingNumber,
+/*N*/ const ScBigRange& rBigRange, const String& rUser, const DateTime& rDateTime, const String& sComment,
+/*N*/ const ScChangeActionType eInType)
/*N*/ :
-/*N*/ ScChangeAction(eType, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment)
+/*N*/ ScChangeAction(eInType, rBigRange, nActionNumber, nRejectingNumber, eInState, rDateTime, rUser, sComment)
/*N*/ {
/*N*/ }
@@ -780,6 +780,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ case SC_CAT_INSERT_TABS :
/*N*/ pDoc->DeleteTab( aRange.aStart.Tab() );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ SetState( SC_CAS_REJECTED );
/*N*/ RemoveAllLinks();
@@ -795,9 +797,9 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ ScChangeAction( SC_CAT_NONE, rRange ),
/*N*/ pTrack( pTrackP ),
/*N*/ pFirstCell( NULL ),
-/*N*/ pLinkMove( NULL ),
/*N*/ pCutOff( NULL ),
/*N*/ nCutOff( 0 ),
+/*N*/ pLinkMove( NULL ),
/*N*/ nDx( nDxP ),
/*N*/ nDy( nDyP )
/*N*/ {
@@ -842,23 +844,23 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ rStrm >> n16s; nDy = n16s;
/*N*/ }
-/*N*/ ScChangeActionDel::ScChangeActionDel(const ULONG nActionNumber, const ScChangeActionState eState, const ULONG nRejectingNumber,
-/*N*/ const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, const String &sComment,
-/*N*/ const ScChangeActionType eType, const short nD, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
+/*N*/ ScChangeActionDel::ScChangeActionDel(const ULONG nActionNumber, const ScChangeActionState eInState, const ULONG nRejectingNumber,
+/*N*/ const ScBigRange& rBigRange, const String& rUser, const DateTime& rDateTime, const String &sComment,
+/*N*/ const ScChangeActionType eInType, const short nD, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
/*N*/ :
-/*N*/ ScChangeAction(eType, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment),
+/*N*/ ScChangeAction(eInType, rBigRange, nActionNumber, nRejectingNumber, eInState, rDateTime, rUser, sComment),
/*N*/ pTrack( pTrackP ),
/*N*/ pFirstCell( NULL ),
-/*N*/ pLinkMove( NULL ),
/*N*/ pCutOff( NULL ),
/*N*/ nCutOff( 0 ),
+/*N*/ pLinkMove( NULL ),
/*N*/ nDx( 0 ),
/*N*/ nDy( 0 )
/*N*/ {
-/*N*/ if (eType == SC_CAT_DELETE_COLS)
-/*N*/ nDx = nD;
-/*N*/ else if (eType == SC_CAT_DELETE_ROWS)
-/*N*/ nDy = nD;
+/*N*/ if (eInType == SC_CAT_DELETE_COLS)
+/*N*/ nDx = nD;
+/*N*/ else if (eInType == SC_CAT_DELETE_ROWS)
+/*N*/ nDy = nD;
/*N*/ }
/*N*/ ScChangeActionDel::~ScChangeActionDel()
@@ -895,7 +897,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
/*N*/ rStrm << nCount;
/*N*/ ScChangeActionDelMoveEntry* pHere;
-/*N*/ while ( pHere = (ScChangeActionDelMoveEntry*) pStack->Pop() )
+/*N*/ while (( pHere = (ScChangeActionDelMoveEntry*) pStack->Pop() ))
/*N*/ {
/*N*/ ScChangeAction* p = pHere->GetAction();
/*N*/ rStrm << (UINT32) ( p ? p->GetActionNumber() : 0 );
@@ -913,9 +915,9 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ BOOL ScChangeActionDel::LoadLinks( SvStream& rStrm, ScChangeTrack* pTrack )
+/*N*/ BOOL ScChangeActionDel::LoadLinks( SvStream& rStrm, ScChangeTrack* pInTrack )
/*N*/ {
-/*N*/ BOOL bOk = ScChangeAction::LoadLinks( rStrm, pTrack );
+/*N*/ BOOL bOk = ScChangeAction::LoadLinks( rStrm, pInTrack );
/*N*/ UINT32 nCount;
/*N*/ rStrm >> nCount;
/*N*/ for ( UINT32 j = 0; j < nCount; j++ )
@@ -925,7 +927,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ rStrm >> nAct;
/*N*/ if ( nAct )
/*N*/ {
-/*N*/ pAct = (ScChangeActionMove*) pTrack->GetAction( nAct );
+/*N*/ pAct = (ScChangeActionMove*) pInTrack->GetAction( nAct );
/*N*/ DBG_ASSERT( pAct, "ScChangeActionDel::LoadLinks: missing Move" );
/*N*/ }
/*N*/ INT16 nFrom, nTo;
@@ -937,11 +939,11 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
/*N*/ if ( pCutOff )
/*N*/ {
-/*N*/ pCutOff = (ScChangeActionIns*) pTrack->GetAction( (ULONG) pCutOff );
+/*N*/ pCutOff = (ScChangeActionIns*) pInTrack->GetAction( (ULONG) pCutOff );
/*N*/ DBG_ASSERT( pCutOff, "ScChangeActionDel::LoadLinks: missing Insert" );
/*N*/ }
/*N*/
-/*N*/ bOk &= ScChangeAction::LoadCellList( this, pFirstCell, rStrm, pTrack );
+/*N*/ bOk &= ScChangeAction::LoadCellList( this, pFirstCell, rStrm, pInTrack );
/*N*/
/*N*/ return bOk;
/*N*/ }
@@ -992,9 +994,9 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ void ScChangeActionDel::UpdateReference( const ScChangeTrack* /*pTrack*/,
/*N*/ UpdateRefMode eMode, const ScBigRange& rRange,
-/*N*/ INT32 nDx, INT32 nDy, INT32 nDz )
+/*N*/ INT32 nInDx, INT32 nInDy, INT32 nInDz )
/*N*/ {
-/*N*/ ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, GetBigRange() );
+/*N*/ ScRefUpdate::Update( eMode, rRange, nInDx, nInDy, nInDz, GetBigRange() );
/*N*/ if ( !IsDeletedIn() )
/*N*/ return ;
/*N*/ // evtl. in "druntergerutschten" anpassen
@@ -1018,6 +1020,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ p->GetBigRange().aStart.SetTab( GetBigRange().aStart.Tab() );
/*N*/ p->GetBigRange().aEnd.SetTab( GetBigRange().aStart.Tab() );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
@@ -1104,12 +1108,12 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ case SC_CAT_DELETE_COLS :
/*N*/ if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) )
/*N*/ { // nur wenn nicht TabDelete
-/*N*/ if ( bOk = pDoc->CanInsertCol( aRange ) )
+/*N*/ if (( bOk = pDoc->CanInsertCol( aRange ) ))
/*N*/ bOk = pDoc->InsertCol( aRange );
/*N*/ }
/*N*/ break;
/*N*/ case SC_CAT_DELETE_ROWS :
-/*N*/ if ( bOk = pDoc->CanInsertRow( aRange ) )
+/*N*/ if (( bOk = pDoc->CanInsertRow( aRange ) ))
/*N*/ bOk = pDoc->InsertRow( aRange );
/*N*/ break;
/*N*/ case SC_CAT_DELETE_TABS :
@@ -1117,10 +1121,12 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ //2do: Tabellennamen merken?
/*N*/ String aName;
/*N*/ pDoc->CreateValidTabName( aName );
-/*N*/ if ( bOk = pDoc->ValidNewTabName( aName ) )
+/*N*/ if (( bOk = pDoc->ValidNewTabName( aName ) ))
/*N*/ bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName );
/*N*/ }
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ pTrack->SetInDelete( FALSE );
/*N*/ pTrack->SetInDeleteUndo( FALSE );
@@ -1181,6 +1187,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ else if ( nTo < 0 )
/*N*/ pMove->GetBigRange().aEnd.IncTab( -nTo );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ delete pLinkMove; // rueckt sich selbst hoch
/*N*/ }
@@ -1210,6 +1218,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ else
/*N*/ pCutOff->GetBigRange().aStart.IncTab( -nCutOff );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ SetCutOffInsert( NULL, 0 );
/*N*/ }
@@ -1230,11 +1240,11 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ rStrm >> aFromRange;
/*N*/ }
-/*N*/ ScChangeActionMove::ScChangeActionMove(const ULONG nActionNumber, const ScChangeActionState eState, const ULONG nRejectingNumber,
-/*N*/ const ScBigRange& aToBigRange, const String& aUser, const DateTime& aDateTime, const String &sComment,
+/*N*/ ScChangeActionMove::ScChangeActionMove(const ULONG nActionNumber, const ScChangeActionState eInState, const ULONG nRejectingNumber,
+/*N*/ const ScBigRange& aToBigRange, const String& rUser, const DateTime& rDateTime, const String &sComment,
/*N*/ const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
/*N*/ :
-/*N*/ ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment),
+/*N*/ ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eInState, rDateTime, rUser, sComment),
/*N*/ aFromRange(aFromBigRange),
/*N*/ pTrack( pTrackP ),
/*N*/ pFirstCell( NULL ),
@@ -1265,10 +1275,10 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ BOOL ScChangeActionMove::LoadLinks( SvStream& rStrm, ScChangeTrack* pTrack )
+/*N*/ BOOL ScChangeActionMove::LoadLinks( SvStream& rStrm, ScChangeTrack* pInTrack )
/*N*/ {
-/*N*/ BOOL bOk = ScChangeAction::LoadLinks( rStrm, pTrack );
-/*N*/ bOk &= ScChangeAction::LoadCellList( this, pFirstCell, rStrm, pTrack );
+/*N*/ BOOL bOk = ScChangeAction::LoadLinks( rStrm, pInTrack );
+/*N*/ bOk &= ScChangeAction::LoadCellList( this, pFirstCell, rStrm, pInTrack );
/*N*/ return bOk;
/*N*/ }
@@ -1432,19 +1442,19 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ }
/*N*/ ScChangeActionContent::ScChangeActionContent( const ULONG nActionNumber,
-/*N*/ const ScChangeActionState eState, const ULONG nRejectingNumber,
-/*N*/ const ScBigRange& aBigRange, const String& aUser,
-/*N*/ const DateTime& aDateTime, const String& sComment,
+/*N*/ const ScChangeActionState eInState, const ULONG nRejectingNumber,
+/*N*/ const ScBigRange& rBigRange, const String& rUser,
+/*N*/ const DateTime& rDateTime, const String& sComment,
/*N*/ ScBaseCell* pTempOldCell, ScDocument* pDoc, const String& sResult )
/*N*/ :
-/*N*/ ScChangeAction(SC_CAT_CONTENT, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment),
+/*N*/ ScChangeAction(SC_CAT_CONTENT, rBigRange, nActionNumber, nRejectingNumber, eInState, rDateTime, rUser, sComment),
+/*N*/ aOldValue(sResult),
/*N*/ pOldCell(pTempOldCell),
/*N*/ pNewCell(NULL),
/*N*/ pNextContent(NULL),
/*N*/ pPrevContent(NULL),
/*N*/ pNextInSlot(NULL),
-/*N*/ ppPrevInSlot(NULL),
-/*N*/ aOldValue(sResult)
+/*N*/ ppPrevInSlot(NULL)
/*N*/
/*N*/ {
/*N*/ if (pOldCell)
@@ -1452,12 +1462,12 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ }
/*N*/ ScChangeActionContent::ScChangeActionContent( const ULONG nActionNumber,
-/*N*/ ScBaseCell* pTempNewCell, const ScBigRange& aBigRange,
+/*N*/ ScBaseCell* pTempNewCell, const ScBigRange& rBigRange,
/*N*/ ScDocument* pDoc )
/*N*/ :
-/*N*/ ScChangeAction(SC_CAT_CONTENT, aBigRange, nActionNumber),
-/*N*/ pNewCell(pTempNewCell),
+/*N*/ ScChangeAction(SC_CAT_CONTENT, rBigRange, nActionNumber),
/*N*/ pOldCell(NULL),
+/*N*/ pNewCell(pTempNewCell),
/*N*/ pNextContent(NULL),
/*N*/ pPrevContent(NULL),
/*N*/ pNextInSlot(NULL),
@@ -1636,12 +1646,12 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ const ScBaseCell* pCell = GetNewCell();
/*N*/ if ( ScChangeActionContent::GetContentCellType( pCell ) == SC_CACCT_MATORG )
/*N*/ {
-/*N*/ ScBigRange aBigRange( GetBigRange() );
+/*N*/ ScBigRange aLclBigRange( GetBigRange() );
/*N*/ USHORT nC, nR;
/*N*/ ((const ScFormulaCell*)pCell)->GetMatColsRows( nC, nR );
-/*N*/ aBigRange.aEnd.IncCol( nC-1 );
-/*N*/ aBigRange.aEnd.IncRow( nR-1 );
-/*N*/ rStr = ScChangeAction::GetRefString( aBigRange, pDoc, bFlag3D );
+/*N*/ aLclBigRange.aEnd.IncCol( nC-1 );
+/*N*/ aLclBigRange.aEnd.IncRow( nR-1 );
+/*N*/ rStr = ScChangeAction::GetRefString( aLclBigRange, pDoc, bFlag3D );
/*N*/
/*N*/ return ;
/*N*/ }
@@ -1754,6 +1764,8 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ case CELLTYPE_FORMULA :
/*N*/ ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ else
@@ -1780,6 +1792,8 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ case CELLTYPE_FORMULA :
/*N*/ ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
@@ -1806,6 +1820,8 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ case CELLTYPE_FORMULA :
/*N*/ GetFormulaString( rStr, (ScFormulaCell*) pCell );
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ else
@@ -2022,6 +2038,8 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ aTmpRange.aEnd.IncTab( nDz );
/*N*/ }
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ ScRange aRange( aTmpRange.MakeRange() );
/*N*/ if ( bOldFormula )
@@ -2041,10 +2059,10 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ ScToken* t;
/*N*/ ScTokenArray* pArr = ((ScFormulaCell*)pOldCell)->GetCode();
/*N*/ pArr->Reset();
-/*N*/ while ( t = pArr->GetNextReference() )
+/*N*/ while (( t = pArr->GetNextReference() ))
/*N*/ lcl_InvalidateReference( *t, rPos );
/*N*/ pArr->Reset();
-/*N*/ while ( t = pArr->GetNextReferenceRPN() )
+/*N*/ while (( t = pArr->GetNextReferenceRPN() ))
/*N*/ lcl_InvalidateReference( *t, rPos );
/*N*/ }
/*N*/ if ( bNewFormula )
@@ -2052,10 +2070,10 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ ScToken* t;
/*N*/ ScTokenArray* pArr = ((ScFormulaCell*)pNewCell)->GetCode();
/*N*/ pArr->Reset();
-/*N*/ while ( t = pArr->GetNextReference() )
+/*N*/ while (( t = pArr->GetNextReference() ))
/*N*/ lcl_InvalidateReference( *t, rPos );
/*N*/ pArr->Reset();
-/*N*/ while ( t = pArr->GetNextReferenceRPN() )
+/*N*/ while (( t = pArr->GetNextReferenceRPN() ))
/*N*/ lcl_InvalidateReference( *t, rPos );
/*N*/ }
/*N*/ }
@@ -2072,10 +2090,10 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ {
/*N*/ }
-/*N*/ ScChangeActionReject::ScChangeActionReject(const ULONG nActionNumber, const ScChangeActionState eState, const ULONG nRejectingNumber,
-/*N*/ const ScBigRange& aBigRange, const String& aUser, const DateTime& aDateTime, const String& sComment)
+/*N*/ ScChangeActionReject::ScChangeActionReject(const ULONG nActionNumber, const ScChangeActionState eInState, const ULONG nRejectingNumber,
+/*N*/ const ScBigRange& aInBigRange, const String& aInUser, const DateTime& aInDateTime, const String& sComment)
/*N*/ :
-/*N*/ ScChangeAction(SC_CAT_CONTENT, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment)
+/*N*/ ScChangeAction(SC_CAT_CONTENT, aInBigRange, nActionNumber, nRejectingNumber, eInState, aInDateTime, aInUser, sComment)
/*N*/ {
/*N*/ }
@@ -2115,8 +2133,8 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ }
/*N*/ ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const StrCollection& aTempUserCollection) :
-/*N*/ pDoc( pDocP ),
-/*N*/ aUserCollection(aTempUserCollection)
+/*N*/ aUserCollection(aTempUserCollection),
+/*N*/ pDoc( pDocP )
/*N*/ {
/*N*/ Init();
/*N*/ StartListening( *SfxGetpApp() );
@@ -2197,11 +2215,11 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ pBlockModifyMsg = NULL;
/*N*/ }
/*N*/ ScChangeTrackMsgInfo* pMsgInfo;
-/*N*/ while ( pMsgInfo = aMsgStackTmp.Pop() )
+/*N*/ while (( pMsgInfo = aMsgStackTmp.Pop() ))
/*N*/ delete pMsgInfo;
-/*N*/ while ( pMsgInfo = aMsgStackFinal.Pop() )
+/*N*/ while (( pMsgInfo = aMsgStackFinal.Pop() ))
/*N*/ delete pMsgInfo;
-/*N*/ while ( pMsgInfo = aMsgQueue.Get() )
+/*N*/ while (( pMsgInfo = aMsgQueue.Get() ))
/*N*/ delete pMsgInfo;
/*N*/ }
@@ -2301,7 +2319,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ {
/*N*/ BOOL bNew = FALSE;
/*N*/ ScChangeTrackMsgInfo* pMsg;
-/*N*/ while ( pMsg = aMsgStackFinal.Pop() )
+/*N*/ while (( pMsg = aMsgStackFinal.Pop() ))
/*N*/ {
/*N*/ aMsgQueue.Put( pMsg );
/*N*/ bNew = TRUE;
@@ -2657,6 +2675,8 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ pAppend->AddLink( NULL, pLink );
/*N*/ }
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
@@ -2714,7 +2734,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ if ( pAppend->GetType() == SC_CAT_CONTENT )
/*N*/ {
/*N*/ ScChangeActionContent* pContent = (ScChangeActionContent*) pAppend;
-/*N*/ if ( pContent = pContent->GetPrevContent() )
+/*N*/ if (( pContent = pContent->GetPrevContent() ))
/*N*/ {
/*N*/ ULONG nMod = pContent->GetActionNumber();
/*N*/ NotifyModified( SC_CTM_CHANGE, nMod, nMod );
@@ -3133,7 +3153,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ if ( pRemove->GetType() == SC_CAT_CONTENT )
/*N*/ {
/*N*/ ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove;
-/*N*/ if ( pContent = pContent->GetPrevContent() )
+/*N*/ if (( pContent = pContent->GetPrevContent() ))
/*N*/ {
/*N*/ ULONG nMod = pContent->GetActionNumber();
/*N*/ NotifyModified( SC_CTM_CHANGE, nMod, nMod );
@@ -3263,7 +3283,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ ScChangeActionDel* pActDel = (ScChangeActionDel*) pAct;
/*N*/ if ( !bUndo )
/*N*/ { // Delete
-/*N*/ ScChangeActionType eInsType; // fuer Insert-Undo-"Deletes"
+/*N*/ ScChangeActionType eInsType(SC_CAT_NONE); // fuer Insert-Undo-"Deletes
/*N*/ switch ( eActType )
/*N*/ {
/*N*/ case SC_CAT_DELETE_COLS :
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 22ea325..ae66006 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -86,7 +86,7 @@ namespace binfilter {
/*N*/ BOOL bTemp;
/*N*/ };
-/*N*/ static sal_Char* pInternal[ 5 ] = { "GAME", "SPEW", "TTT", "STARCALCTEAM", "ANTWORT" };
+/*N*/ static const sal_Char* pInternal[ 5 ] = { "GAME", "SPEW", "TTT", "STARCALCTEAM", "ANTWORT" };
/////////////////////////////////////////////////////////////////////////
@@ -686,6 +686,8 @@ namespace binfilter {
/*N*/ if( nMask & SC_COMPILER_C_STRING_SEP )
/*N*/ eState = ssStop;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ cLast = c;
/*N*/ c = *pSrc;
@@ -1091,6 +1093,8 @@ namespace binfilter {
/*?*/ case CELLTYPE_EDIT:
/*?*/ ((ScEditCell*)pCell)->GetString( aStr );
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*?*/ }
/*?*/ if ( ScGlobal::pTransliteration->isEqual( aStr, aName ) )
/*?*/ {
@@ -1112,7 +1116,7 @@ namespace binfilter {
/*N*/ }
/*N*/ if ( !bInList && pDoc->GetDocOptions().IsLookUpColRowNames() )
/*N*/ { // in der aktuellen Tabelle suchen
-/*N*/ long nDistance, nMax;
+/*N*/ long nDistance(0), nMax(0);
/*N*/ long nMyCol = (long) aPos.Col();
/*N*/ long nMyRow = (long) aPos.Row();
/*N*/ BOOL bTwo = FALSE;
@@ -1145,6 +1149,8 @@ namespace binfilter {
/*N*/ case CELLTYPE_EDIT:
/*N*/ ((ScEditCell*)pCell)->GetString( aStr );
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ if ( ScGlobal::pTransliteration->isEqual( aStr, aName ) )
/*N*/ {
@@ -1303,12 +1309,12 @@ namespace binfilter {
/*N*/ {
/*N*/ String aSymbol( aCorrectedSymbol );
/*N*/ String aDoc;
-/*N*/ xub_StrLen nPos;
+/*N*/ xub_StrLen nLclPos;
/*N*/ if ( aSymbol.GetChar(0) == '\''
-/*N*/ && ((nPos = aSymbol.SearchAscii( "'#" )) != STRING_NOTFOUND) )
+/*N*/ && ((nLclPos = aSymbol.SearchAscii( "'#" )) != STRING_NOTFOUND) )
/*N*/ { // 'Doc'# abspalten, kann d:\... und sonstwas sein
-/*N*/ aDoc = aSymbol.Copy( 0, nPos + 2 );
-/*N*/ aSymbol.Erase( 0, nPos + 2 );
+/*N*/ aDoc = aSymbol.Copy( 0, nLclPos + 2 );
+/*N*/ aSymbol.Erase( 0, nLclPos + 2 );
/*N*/ }
/*N*/ xub_StrLen nRefs = aSymbol.GetTokenCount( ':' );
/*N*/ BOOL bColons;
@@ -1391,13 +1397,13 @@ namespace binfilter {
/*N*/ for ( int j=0; j<nRefs; j++ )
/*N*/ {
/*N*/ xub_StrLen nTmp = 0;
-/*N*/ xub_StrLen nPos = STRING_NOTFOUND;
+/*N*/ xub_StrLen nLclPosB = STRING_NOTFOUND;
/*N*/ while ( (nTmp = aRef[j].Search( '.', nTmp )) != STRING_NOTFOUND )
-/*N*/ nPos = nTmp++; // der letzte zaehlt
-/*N*/ if ( nPos != STRING_NOTFOUND )
+/*N*/ nLclPosB = nTmp++; // der letzte zaehlt
+/*N*/ if ( nLclPosB != STRING_NOTFOUND )
/*N*/ {
-/*N*/ aTab[j] = aRef[j].Copy( 0, nPos + 1 ); // mit '.'
-/*N*/ aRef[j].Erase( 0, nPos + 1 );
+/*N*/ aTab[j] = aRef[j].Copy( 0, nLclPosB + 1 ); // mit '.'
+/*N*/ aRef[j].Erase( 0, nLclPosB + 1 );
/*N*/ }
/*N*/ String aOld( aRef[j] );
/*N*/ String aStr2;
@@ -1703,8 +1709,8 @@ namespace binfilter {
/*N*/ // kurz: wenn kein eigenstaendiger Ausdruck
/*N*/ ScToken* p1 = pArr->PeekPrevNoSpaces();
/*N*/ ScToken* p2 = pArr->PeekNextNoSpaces();
-/*N*/ OpCode eOp1 = (p1 ? p1->GetOpCode() : ocSep);
-/*N*/ OpCode eOp2 = (p2 ? p2->GetOpCode() : ocSep);
+/*N*/ OpCode eOp1 = (p1 ? p1->GetOpCode() : static_cast<OpCode>(ocSep));
+/*N*/ OpCode eOp2 = (p2 ? p2->GetOpCode() : static_cast<OpCode>(ocSep));
/*N*/ BOOL bBorder1 = (eOp1 == ocSep || eOp1 == ocOpen);
/*N*/ BOOL bBorder2 = (eOp2 == ocSep || eOp2 == ocClose);
/*N*/ BOOL bAddPair = !(bBorder1 && bBorder2);
@@ -1869,8 +1875,8 @@ namespace binfilter {
/*N*/ ScToken* p1 = pArr->PeekPrevNoSpaces();
/*N*/ ScToken* p2 = pArr->PeekNextNoSpaces();
/*N*/ // Anfang/Ende einer Formel => Single
-/*N*/ OpCode eOp1 = p1 ? p1->GetOpCode() : ocAdd;
-/*N*/ OpCode eOp2 = p2 ? p2->GetOpCode() : ocAdd;
+/*N*/ OpCode eOp1 = p1 ? p1->GetOpCode() : static_cast<OpCode>(ocAdd);
+/*N*/ OpCode eOp2 = p2 ? p2->GetOpCode() : static_cast<OpCode>(ocAdd);
/*N*/ if ( eOp1 != ocColRowName && eOp1 != ocIntersect
/*N*/ && eOp2 != ocColRowName && eOp2 != ocIntersect )
/*N*/ {
@@ -2986,21 +2992,21 @@ namespace binfilter {
/*N*/ return pRangeData;
/*N*/ }
-/*N*/ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pToken,
+/*N*/ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pInToken,
/*N*/ BOOL bAllowArrAdvance )
/*N*/ {
/*N*/ ::rtl::OUStringBuffer aBuffer;
-/*N*/ ScToken* p = CreateStringFromToken( aBuffer, pToken, bAllowArrAdvance );
+/*N*/ ScToken* p = CreateStringFromToken( aBuffer, pInToken, bAllowArrAdvance );
/*N*/ rFormula += aBuffer;
/*N*/ return p;
/*N*/ }
-/*N*/ ScToken* ScCompiler::CreateStringFromToken( ::rtl::OUStringBuffer& rBuffer, ScToken* pToken,
+/*N*/ ScToken* ScCompiler::CreateStringFromToken( ::rtl::OUStringBuffer& rBuffer, ScToken* pInToken,
/*N*/ BOOL bAllowArrAdvance )
/*N*/ {
/*N*/ BOOL bNext = TRUE;
/*N*/ BOOL bSpaces = FALSE;
-/*N*/ ScToken* t = pToken;
+/*N*/ ScToken* t = pInToken;
/*N*/ OpCode eOp = t->GetOpCode();
/*N*/ if( eOp >= ocAnd && eOp <= ocOr )
/*N*/ {
@@ -3167,7 +3173,7 @@ namespace binfilter {
/*N*/ t = pArr->Next();
/*N*/ return t;
/*N*/ }
-/*N*/ return pToken;
+/*N*/ return pInToken;
/*N*/ }
/*N*/ void ScCompiler::CreateStringFromTokenArray( String& rFormula )
diff --git a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
index 8023dbf..b4260e9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
@@ -44,39 +44,6 @@ namespace binfilter {
#define SC_CONS_NOTFOUND 0xFFFF
-// STATIC DATA -----------------------------------------------------------
-
-/* Strings bei Gelegenheit ganz raus...
-static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
- 0, // none
- STR_PIVOTFUNC_AVG,
- STR_PIVOTFUNC_COUNT,
- STR_PIVOTFUNC_COUNT2,
- STR_PIVOTFUNC_MAX,
- STR_PIVOTFUNC_MIN,
- STR_PIVOTFUNC_PROD,
- STR_PIVOTFUNC_STDDEV,
- STR_PIVOTFUNC_STDDEV2,
- STR_PIVOTFUNC_SUM,
- STR_PIVOTFUNC_VAR,
- STR_PIVOTFUNC_VAR2 };
-*/
-
-/*N*/ static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc
-/*N*/ ocBad, // none
-/*N*/ ocAverage,
-/*N*/ ocCount,
-/*N*/ ocCount2,
-/*N*/ ocMax,
-/*N*/ ocMin,
-/*N*/ ocProduct,
-/*N*/ ocStDev,
-/*N*/ ocStDevP,
-/*N*/ ocSum,
-/*N*/ ocVar,
-/*N*/ ocVarP };
-
-// -----------------------------------------------------------------------
/*N*/ void lcl_AddString( String**& pData, USHORT& nCount, const String& rInsert )
/*N*/ {
@@ -100,14 +67,14 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/ bRowByName(FALSE),
/*N*/ bSubTitles(FALSE),
/*N*/ nColCount(0),
-/*N*/ ppColHeaders(NULL),
/*N*/ nRowCount(0),
-/*N*/ ppRowHeaders(NULL),
-/*N*/ ppCount(NULL),
+/*N*/ ppUsed(NULL),
/*N*/ ppSum(NULL),
+/*N*/ ppCount(NULL),
/*N*/ ppSumSqr(NULL),
/*N*/ ppRefs(NULL),
-/*N*/ ppUsed(NULL),
+/*N*/ ppColHeaders(NULL),
+/*N*/ ppRowHeaders(NULL),
/*N*/ nDataCount(0),
/*N*/ nTitleCount(0),
/*N*/ ppTitles(NULL),
@@ -124,9 +91,8 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/ #define DELETEARR(ppArray,nCount) \
/*N*/ { \
-/*N*/ USHORT i; \
/*N*/ if (ppArray) \
-/*N*/ for(i=0; i<nCount; i++) \
+/*N*/ for(USHORT i=0; i<nCount; i++) \
/*N*/ delete[] ppArray[i]; \
/*N*/ delete[] ppArray; \
/*N*/ ppArray = NULL; \
@@ -134,9 +100,8 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/
/*N*/ #define DELETESTR(ppArray,nCount) \
/*N*/ { \
-/*N*/ USHORT i; \
/*N*/ if (ppArray) \
-/*N*/ for(i=0; i<nCount; i++) \
+/*N*/ for(USHORT i=0; i<nCount; i++) \
/*N*/ delete ppArray[i]; \
/*N*/ delete[] ppArray; \
/*N*/ ppArray = NULL; \
@@ -144,10 +109,8 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/ void ScConsData::DeleteData()
/*N*/ {
-/*N*/ USHORT i;
-/*N*/
/*N*/ if (ppRefs)
-/*N*/ for (i=0; i<nColCount; i++)
+/*N*/ for (USHORT i=0; i<nColCount; i++)
/*N*/ {
/*N*/ for (USHORT j=0; j<nRowCount; j++)
/*N*/ if (ppUsed[i][j])
@@ -520,8 +483,6 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/ void ScConsData::OutputToDocument( ScDocument* pDestDoc, USHORT nCol, USHORT nRow, USHORT nTab )
/*N*/ {
-/*N*/ eOpCodeTable[eFunction];
-/*N*/
/*N*/ USHORT nArrX;
/*N*/ USHORT nArrY;
/*N*/ USHORT i;
diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
index e360b8e..823e303 100644
--- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
@@ -53,14 +53,14 @@ namespace binfilter {
/*N*/ nEndCol (nCol2),
/*N*/ nEndRow (nRow2),
/*N*/ bByRow (bByR),
+/*N*/ bHasHeader (bHasH),
/*N*/ bDoSize (FALSE),
/*N*/ bKeepFmt (FALSE),
/*N*/ bStripData (FALSE),
-/*N*/ bHasHeader (bHasH),
+/*N*/ bIsAdvanced (FALSE),
/*N*/ bDBSelection(FALSE),
/*N*/ nIndex (0),
/*N*/ nExportIndex(0),
-/*N*/ bIsAdvanced (FALSE),
/*N*/ bAutoFilter (FALSE),
/*N*/ bModified (FALSE)
/*N*/ {
@@ -88,22 +88,20 @@ namespace binfilter {
/*N*/ }
/*N*/ ScDBData::ScDBData( SvStream& rStream, ScMultipleReadHeader& rHdr ) :
-/*N*/ // nicht in der Datei:
-/*N*/ bAutoFilter (FALSE),
-/*N*/ bModified (FALSE),
-/*N*/ nExportIndex (0),
-/*N*/ // nicht in alten Versionen:
/*N*/ bDoSize (FALSE),
/*N*/ bKeepFmt (FALSE),
/*N*/ bStripData (FALSE),
-/*N*/ nIndex (0),
+/*N*/ bSortUserDef (FALSE),
+/*N*/ nSortUserIndex (0),
/*N*/ bIsAdvanced (FALSE),
+/*N*/ nSubUserIndex (0),
/*N*/ bDBSelection (FALSE),
/*N*/ bDBSql (TRUE),
/*N*/ nDBType (ScDbTable),
-/*N*/ nSubUserIndex (0),
-/*N*/ bSortUserDef (FALSE),
-/*N*/ nSortUserIndex (0)
+/*N*/ nIndex (0),
+/*N*/ nExportIndex (0),
+/*N*/ bAutoFilter (FALSE),
+/*N*/ bModified (FALSE)
/*N*/ {
/*N*/ rHdr.StartEntry();
/*N*/
@@ -382,11 +380,11 @@ namespace binfilter {
/*N*/ bSortCaseSens (rData.bSortCaseSens),
/*N*/ bIncludePattern (rData.bIncludePattern),
/*N*/ bSortInplace (rData.bSortInplace),
+/*N*/ bSortUserDef (rData.bSortUserDef),
+/*N*/ nSortUserIndex (rData.nSortUserIndex),
/*N*/ nSortDestTab (rData.nSortDestTab),
/*N*/ nSortDestCol (rData.nSortDestCol),
/*N*/ nSortDestRow (rData.nSortDestRow),
-/*N*/ bSortUserDef (rData.bSortUserDef),
-/*N*/ nSortUserIndex (rData.nSortUserIndex),
/*N*/ aSortLocale (rData.aSortLocale),
/*N*/ aSortAlgorithm (rData.aSortAlgorithm),
/*N*/ bQueryInplace (rData.bQueryInplace),
diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
index f4a4b04..e069fa3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
@@ -62,8 +62,8 @@ namespace binfilter {
/*N*/ aTopic( rT ),
/*N*/ aItem( rI ),
/*N*/ nMode( nM ),
-/*N*/ pResult( NULL ),
-/*N*/ bNeedUpdate( FALSE )
+/*N*/ bNeedUpdate( FALSE ),
+/*N*/ pResult( NULL )
/*N*/ {
/*N*/ }
@@ -77,8 +77,8 @@ namespace binfilter {
/*N*/ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr ) :
/*N*/ ::binfilter::SvBaseLink(::binfilter::LINKUPDATE_ALWAYS,FORMAT_STRING),
/*N*/ pDoc( pD ),
-/*N*/ pResult( NULL ),
-/*N*/ bNeedUpdate( FALSE )
+/*N*/ bNeedUpdate( FALSE ),
+/*N*/ pResult( NULL )
/*N*/ {
/*N*/ rHdr.StartEntry();
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_detdata.cxx b/binfilter/bf_sc/source/core/tool/sc_detdata.cxx
index b0fd6ef..4fd8625 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detdata.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detdata.cxx
@@ -46,6 +46,7 @@ namespace binfilter {
//------------------------------------------------------------------------
/*N*/ ScDetOpList::ScDetOpList(const ScDetOpList& rList) :
+/*N*/ ScDetOpArr_Impl(),
/*N*/ bHasAddError( FALSE )
/*N*/ {
/*N*/ USHORT nCount = rList.Count();
@@ -78,12 +79,12 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScDetOpList::Append( ScDetOpData* pData )
+/*N*/ void ScDetOpList::Append( ScDetOpData* pInData )
/*N*/ {
-/*N*/ if ( pData->GetOperation() == SCDETOP_ADDERROR )
+/*N*/ if ( pInData->GetOperation() == SCDETOP_ADDERROR )
/*N*/ bHasAddError = TRUE;
/*N*/
-/*N*/ Insert( pData, Count() );
+/*N*/ Insert( pInData, Count() );
/*N*/ }
@@ -127,9 +128,9 @@ namespace binfilter {
/*N*/
/*N*/ aHdr.StartEntry();
/*N*/
-/*N*/ ScDetOpData* pData = (*this)[i];
-/*N*/ rStream << pData->GetPos();
-/*N*/ rStream << (USHORT) pData->GetOperation();
+/*N*/ ScDetOpData* pLclData = (*this)[i];
+/*N*/ rStream << pLclData->GetPos();
+/*N*/ rStream << (USHORT) pLclData->GetOperation();
/*N*/
/*N*/ aHdr.EndEntry();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index 0f11e2d..d0fc614 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -1161,6 +1161,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/ DBG_ASSERT(pPage,"Page ?");
+/*N*/ (void)pPage;
/*N*/
/*N*/ ScDetectiveData aData( pModel );
/*N*/
@@ -1184,6 +1185,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/ DBG_ASSERT(pPage,"Page ?");
+/*N*/ (void)pPage;
/*N*/
/*N*/ ScDetectiveData aData( pModel );
/*N*/
@@ -1207,6 +1209,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/ DBG_ASSERT(pPage,"Page ?");
+/*N*/ (void)pPage;
/*N*/
/*N*/ ScTripel aPos( nCol, nRow, nTab );
/*N*/ ScTripel aErrPos;
@@ -1229,6 +1232,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/ DBG_ASSERT(pPage,"Page ?");
+/*N*/ (void)pPage;
/*N*/
/*N*/ USHORT nLevelCount = FindSuccLevel( nCol, nRow, nCol, nRow, 0, 0 );
/*N*/ if ( nLevelCount )
@@ -1245,6 +1249,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/ DBG_ASSERT(pPage,"Page ?");
+/*N*/ (void)pPage;
/*N*/
/*N*/ USHORT nLevelCount = FindPredLevel( nCol, nRow, 0, 0 );
/*N*/ if ( nLevelCount )
diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
index 72d8d4f..ba1ac8e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
@@ -75,17 +75,17 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
//------------------------------------------------------------------------
-/*N*/ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy )
-/*N*/ : bIsIgnoreCase( rCpy.bIsIgnoreCase ),
-/*N*/ bIsIter( rCpy.bIsIter ),
-/*N*/ nIterCount( rCpy.nIterCount ),
+/*N*/ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) :
/*N*/ fIterEps( rCpy.fIterEps ),
+/*N*/ nIterCount( rCpy.nIterCount ),
/*N*/ nPrecStandardFormat( rCpy.nPrecStandardFormat ),
/*N*/ nDay( rCpy.nDay ),
/*N*/ nMonth( rCpy.nMonth ),
/*N*/ nYear( rCpy.nYear ),
/*N*/ nYear2000( rCpy.nYear2000 ),
/*N*/ nTabDistance( rCpy.nTabDistance ),
+/*N*/ bIsIgnoreCase( rCpy.bIsIgnoreCase ),
+/*N*/ bIsIter( rCpy.bIsIter ),
/*N*/ bCalcAsShown( rCpy.bCalcAsShown ),
/*N*/ bMatchWholeCell( rCpy.bMatchWholeCell ),
/*N*/ bDoAutoSpell( rCpy.bDoAutoSpell ),
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index e2e4de9..203ea60 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -163,8 +163,8 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ BOOL bDeleteEnginePoolP )
/*N*/ :
/*N*/ pEnginePool( pEnginePoolP ),
-/*N*/ bDeleteEnginePool( bDeleteEnginePoolP ),
/*N*/ pDefaults( NULL ),
+/*N*/ bDeleteEnginePool( bDeleteEnginePoolP ),
/*N*/ bDeleteDefaults( FALSE )
/*N*/ {
/*N*/ }
@@ -173,8 +173,8 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ ScEnginePoolHelper::ScEnginePoolHelper( const ScEnginePoolHelper& rOrg )
/*N*/ :
/*N*/ pEnginePool( rOrg.bDeleteEnginePool ? rOrg.pEnginePool->Clone() : rOrg.pEnginePool ),
-/*N*/ bDeleteEnginePool( rOrg.bDeleteEnginePool ),
/*N*/ pDefaults( NULL ),
+/*N*/ bDeleteEnginePool( rOrg.bDeleteEnginePool ),
/*N*/ bDeleteDefaults( FALSE )
/*N*/ {
/*N*/ }
@@ -390,8 +390,8 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ eNumType = SVX_ARABIC;
/*N*/ }
-/*N*/ ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool )
-/*N*/ : ScEditEngineDefaulter( pEnginePool, bDeleteEnginePool )
+/*N*/ ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pInEnginePool, BOOL bInDeleteEnginePool )
+/*N*/ : ScEditEngineDefaulter( pInEnginePool, bInDeleteEnginePool )
/*N*/ {
/*N*/ }
@@ -449,10 +449,10 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
//
//------------------------------------------------------------------------
-/*N*/ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePool,
-/*N*/ SfxItemPool* pTextObjectPool, BOOL bDeleteEnginePool )
+/*N*/ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pInEnginePool,
+/*N*/ SfxItemPool* pTextObjectPool, BOOL bInDeleteEnginePool )
/*N*/ :
-/*N*/ ScEditEngineDefaulter( pEnginePool, bDeleteEnginePool ),
+/*N*/ ScEditEngineDefaulter( pInEnginePool, bInDeleteEnginePool ),
/*N*/ bExecuteURL( TRUE )
/*N*/ {
/*N*/ if ( pTextObjectPool )
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 7064490..1ac39ff 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -992,6 +992,8 @@ short ScInterpreter::IsString()
case CELLTYPE_FORMULA :
nRes = !((ScFormulaCell*)pCell)->IsValue();
break;
+ default :
+ break;
}
}
}
@@ -1146,7 +1148,7 @@ void ScInterpreter::ScCell()
SetIllegalParameter();
else
{
- String aResult;
+ String aLclResult;
ScBaseCell* pCell = GetCell( aCellPos );
aInfoType.ToUpperAscii();
@@ -1167,8 +1169,8 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "ADDRESS" ) )
{ // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW
USHORT nFlags = (aCellPos.Tab() == aPos.Tab()) ? (SCA_ABS) : (SCA_ABS_3D);
- aCellPos.Format( aResult, nFlags, pDok );
- PushString( aResult );
+ aCellPos.Format( aLclResult, nFlags, pDok );
+ PushString( aLclResult );
}
else if( aInfoType.EqualsAscii( "FILENAME" ) )
{ // file name and table name: 'FILENAME'#$TABLE
@@ -1176,31 +1178,31 @@ void ScInterpreter::ScCell()
if( nTab < pDok->GetTableCount() )
{
if( pDok->GetLinkMode( nTab ) == SC_LINK_VALUE )
- pDok->GetName( nTab, aResult );
+ pDok->GetName( nTab, aLclResult );
else
{
SfxObjectShell* pShell = pDok->GetDocumentShell();
if( pShell && pShell->GetMedium() )
{
- aResult = (sal_Unicode) '\'';
- aResult += pShell->GetMedium()->GetName();
- aResult.AppendAscii( "'#$" );
+ aLclResult = (sal_Unicode) '\'';
+ aLclResult += pShell->GetMedium()->GetName();
+ aLclResult.AppendAscii( "'#$" );
String aTabName;
pDok->GetName( nTab, aTabName );
- aResult += aTabName;
+ aLclResult += aTabName;
}
}
}
- PushString( aResult );
+ PushString( aLclResult );
}
else if( aInfoType.EqualsAscii( "COORD" ) )
{ // address, lotus 1-2-3 formatted: $TABLE:$COL$ROW
- ScAddress( aCellPos.Tab(), 0, 0 ).Format( aResult, (SCA_COL_ABSOLUTE|SCA_VALID_COL) );
- aResult += ':';
+ ScAddress( aCellPos.Tab(), 0, 0 ).Format( aLclResult, (SCA_COL_ABSOLUTE|SCA_VALID_COL) );
+ aLclResult += ':';
String aCellStr;
aCellPos.Format( aCellStr, (SCA_COL_ABSOLUTE|SCA_VALID_COL|SCA_ROW_ABSOLUTE|SCA_VALID_ROW) );
- aResult += aCellStr;
- PushString( aResult );
+ aLclResult += aCellStr;
+ PushString( aLclResult );
}
// *** CELL PROPERTIES ***
@@ -1208,8 +1210,8 @@ void ScInterpreter::ScCell()
{ // contents of the cell, no formatting
if( pCell && pCell->HasStringData() )
{
- GetCellString( aResult, pCell );
- PushString( aResult );
+ GetCellString( aLclResult, pCell );
+ PushString( aLclResult );
}
else
PushDouble( GetCellValue( aCellPos, pCell ) );
@@ -1217,10 +1219,10 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "TYPE" ) )
{ // b = blank; l = string (label); v = otherwise (value)
if( HasCellStringData( pCell ) )
- aResult = 'l';
+ aLclResult = 'l';
else
- aResult = HasCellValueData( pCell ) ? 'v' : 'b';
- PushString( aResult );
+ aLclResult = HasCellValueData( pCell ) ? 'v' : 'b';
+ PushString( aLclResult );
}
else if( aInfoType.EqualsAscii( "WIDTH" ) )
{ // column width (rounded off as count of zero characters in standard font and size)
@@ -1249,13 +1251,13 @@ void ScInterpreter::ScCell()
{
case SVX_HOR_JUSTIFY_STANDARD:
case SVX_HOR_JUSTIFY_LEFT:
- case SVX_HOR_JUSTIFY_BLOCK: aResult = '\''; break;
- case SVX_HOR_JUSTIFY_CENTER: aResult = '^'; break;
- case SVX_HOR_JUSTIFY_RIGHT: aResult = '"'; break;
- case SVX_HOR_JUSTIFY_REPEAT: aResult = '\\'; break;
+ case SVX_HOR_JUSTIFY_BLOCK: aLclResult = '\''; break;
+ case SVX_HOR_JUSTIFY_CENTER: aLclResult = '^'; break;
+ case SVX_HOR_JUSTIFY_RIGHT: aLclResult = '"'; break;
+ case SVX_HOR_JUSTIFY_REPEAT: aLclResult = '\\'; break;
}
}
- PushString( aResult );
+ PushString( aLclResult );
}
else if( aInfoType.EqualsAscii( "PROTECT" ) )
{ // 1 = cell locked
@@ -1275,10 +1277,10 @@ void ScInterpreter::ScCell()
switch( pFormatter->GetType( nFormat ) )
{
- case NUMBERFORMAT_NUMBER: aResult = (bThousand ? ',' : 'F'); break;
- case NUMBERFORMAT_CURRENCY: aResult = 'C'; break;
- case NUMBERFORMAT_SCIENTIFIC: aResult = 'S'; break;
- case NUMBERFORMAT_PERCENT: aResult = 'P'; break;
+ case NUMBERFORMAT_NUMBER: aLclResult = (bThousand ? ',' : 'F'); break;
+ case NUMBERFORMAT_CURRENCY: aLclResult = 'C'; break;
+ case NUMBERFORMAT_SCIENTIFIC: aLclResult = 'S'; break;
+ case NUMBERFORMAT_PERCENT: aLclResult = 'P'; break;
default:
{
bAppendPrec = FALSE;
@@ -1291,29 +1293,29 @@ void ScInterpreter::ScCell()
case NF_DATE_SYS_DMMMYYYY:
case NF_DATE_DIN_DMMMYYYY:
case NF_DATE_SYS_DMMMMYYYY:
- case NF_DATE_DIN_DMMMMYYYY: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D1" ) ); break;
- case NF_DATE_SYS_DDMMM: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D2" ) ); break;
- case NF_DATE_SYS_MMYY: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D3" ) ); break;
+ case NF_DATE_DIN_DMMMMYYYY: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D1" ) ); break;
+ case NF_DATE_SYS_DDMMM: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D2" ) ); break;
+ case NF_DATE_SYS_MMYY: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D3" ) ); break;
case NF_DATETIME_SYSTEM_SHORT_HHMM:
case NF_DATETIME_SYS_DDMMYYYY_HHMMSS:
- aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D4" ) ); break;
- case NF_DATE_DIN_MMDD: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D5" ) ); break;
- case NF_TIME_HHMMSSAMPM: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D6" ) ); break;
- case NF_TIME_HHMMAMPM: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D7" ) ); break;
- case NF_TIME_HHMMSS: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D8" ) ); break;
- case NF_TIME_HHMM: aResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D9" ) ); break;
- default: aResult = 'G';
+ aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D4" ) ); break;
+ case NF_DATE_DIN_MMDD: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D5" ) ); break;
+ case NF_TIME_HHMMSSAMPM: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D6" ) ); break;
+ case NF_TIME_HHMMAMPM: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D7" ) ); break;
+ case NF_TIME_HHMMSS: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D8" ) ); break;
+ case NF_TIME_HHMM: aLclResult.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "D9" ) ); break;
+ default: aLclResult = 'G';
}
}
}
if( bAppendPrec )
- aResult += String::CreateFromInt32( nPrec );
+ aLclResult += String::CreateFromInt32( nPrec );
const SvNumberformat* pFormat = pFormatter->GetEntry( nFormat );
if( lcl_FormatHasNegColor( pFormat ) )
- aResult += '-';
+ aLclResult += '-';
if( lcl_FormatHasOpenPar( pFormat ) )
- aResult.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "()" ) );
- PushString( aResult );
+ aLclResult.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "()" ) );
+ PushString( aLclResult );
}
else if( aInfoType.EqualsAscii( "COLOR" ) )
{ // 1 = negative values are colored, otherwise 0
@@ -1385,6 +1387,8 @@ void ScInterpreter::ScIsValue()
case CELLTYPE_FORMULA :
nRes = ((ScFormulaCell*)pCell)->IsValue();
break;
+ default :
+ break;
}
}
}
@@ -1730,6 +1734,8 @@ void ScInterpreter::ScT()
case CELLTYPE_FORMULA :
bValue = ((ScFormulaCell*)pCell)->IsValue();
break;
+ default :
+ break;
}
}
if ( bValue )
@@ -1875,22 +1881,22 @@ void ScInterpreter::ScChar()
/*?*/ pMat->GetDimensions(nC, nR);
/*?*/ if (pMat->IsNumeric())
/*?*/ {
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ nVal = pMat->GetDouble(i,j);
+/*?*/ nVal = pMat->GetDouble(k,j);
/*?*/ if (nMin > nVal) nMin = nVal;
/*?*/ }
/*?*/ }
/*?*/ else
/*?*/ {
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ {
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ if (!pMat->IsString(i,j))
+/*?*/ if (!pMat->IsString(k,j))
/*?*/ {
-/*?*/ nVal = pMat->GetDouble(i,j);
+/*?*/ nVal = pMat->GetDouble(k,j);
/*?*/ if (nMin > nVal) nMin = nVal;
/*?*/ }
/*?*/ else if ( bTextAsZero )
@@ -1995,22 +2001,22 @@ void ScInterpreter::ScChar()
/*?*/ pMat->GetDimensions(nC, nR);
/*?*/ if (pMat->IsNumeric())
/*?*/ {
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ nVal = pMat->GetDouble(i,j);
+/*?*/ nVal = pMat->GetDouble(k,j);
/*?*/ if (nMax < nVal) nMax = nVal;
/*?*/ }
/*?*/ }
/*?*/ else
/*?*/ {
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ {
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ if (!pMat->IsString(i,j))
+/*?*/ if (!pMat->IsString(k,j))
/*?*/ {
-/*?*/ nVal = pMat->GetDouble(i,j);
+/*?*/ nVal = pMat->GetDouble(k,j);
/*?*/ if (nMax < nVal) nMax = nVal;
/*?*/ }
/*?*/ else if ( bTextAsZero )
@@ -2123,6 +2129,7 @@ void ScInterpreter::ScChar()
/*?*/ break;
/*?*/ case ifSUMSQ: fRes += fVal * fVal; break;
/*?*/ case ifPRODUCT: fRes *= fVal; break;
+/*?*/ default: break;
/*?*/ }
/*?*/ nFuncFmtType = NUMBERFORMAT_NUMBER;
/*?*/ break;
@@ -2157,6 +2164,7 @@ void ScInterpreter::ScChar()
/*?*/ break;
/*?*/ case ifSUMSQ: fRes += fVal * fVal; break;
/*?*/ case ifPRODUCT: fRes *= fVal; break;
+/*?*/ default: break;
/*?*/ }
/*?*/ }
/*?*/ else if ( bTextAsZero && pCell->HasStringData() )
@@ -2176,7 +2184,7 @@ void ScInterpreter::ScChar()
/*N*/ {
/*N*/ ScBaseCell* pCell;
/*N*/ ScCellIterator aIter( pDok, aRange, glSubTotal );
-/*N*/ if (pCell = aIter.GetFirst())
+/*N*/ if ((pCell = aIter.GetFirst()))
/*N*/ {
/*N*/ do
/*N*/ {
@@ -2184,7 +2192,7 @@ void ScInterpreter::ScChar()
/*N*/ if( eType != CELLTYPE_NONE && eType != CELLTYPE_NOTE )
/*N*/ nCount++;
/*N*/ }
-/*N*/ while ( pCell = aIter.GetNext());
+/*N*/ while ((pCell = aIter.GetNext()));
/*N*/ }
/*N*/ }
/*N*/ else
@@ -2256,14 +2264,14 @@ void ScInterpreter::ScChar()
/*?*/ nCount += (ULONG) nC * nR;
/*?*/ else
/*?*/ {
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ {
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ if (!pMat->IsString(i,j))
+/*?*/ if (!pMat->IsString(k,j))
/*?*/ {
/*?*/ nCount++;
-/*?*/ fVal = pMat->GetDouble(i,j);
+/*?*/ fVal = pMat->GetDouble(k,j);
/*?*/ switch( eFunc )
/*?*/ {
/*?*/ case ifAVERAGE:
@@ -2278,6 +2286,7 @@ void ScInterpreter::ScChar()
/*?*/ break;
/*?*/ case ifSUMSQ: fRes += fVal * fVal; break;
/*?*/ case ifPRODUCT: fRes *= fVal; break;
+/*?*/ default: break;
/*?*/ }
/*?*/ }
/*?*/ else if ( bTextAsZero )
@@ -2305,6 +2314,7 @@ void ScInterpreter::ScChar()
/*N*/ case ifCOUNT2:
/*N*/ case ifCOUNT: fRes = nCount; break;
/*N*/ case ifPRODUCT: if ( !nCount ) fRes = 0.0; break;
+/*N*/ default: break;
/*N*/ }
/*N*/ // Bei Summen etc. macht ein BOOL-Ergebnis keinen Sinn
/*N*/ // und Anzahl ist immer Number (#38345#)
@@ -2354,14 +2364,13 @@ void ScInterpreter::ScCount()
/*N*/ BOOL bTextAsZero )
/*N*/ {
/*N*/ BYTE nParamCount = GetByte();
-/*N*/ USHORT i;
/*N*/ double fSum = 0.0;
/*N*/ double fSumSqr = 0.0;
/*N*/ double fVal;
/*N*/ rValCount = 0.0;
/*N*/ ScAddress aAdr;
/*N*/ ScRange aRange;
-/*N*/ for (i = 0; i < nParamCount; i++)
+/*N*/ for (USHORT i = 0; i < nParamCount; i++)
/*N*/ {
/*N*/ switch (GetStackType())
/*N*/ {
@@ -2412,13 +2421,13 @@ void ScInterpreter::ScCount()
/*?*/ {
/*?*/ USHORT nC, nR;
/*?*/ pMat->GetDimensions(nC, nR);
-/*?*/ for (USHORT i = 0; i < nC; i++)
+/*?*/ for (USHORT k = 0; k < nC; k++)
/*?*/ {
/*?*/ for (USHORT j = 0; j < nR; j++)
/*?*/ {
-/*?*/ if (!pMat->IsString(i,j))
+/*?*/ if (!pMat->IsString(k,j))
/*?*/ {
-/*?*/ fVal= pMat->GetDouble(i,j);
+/*?*/ fVal= pMat->GetDouble(k,j);
/*?*/ fSum += fVal;
/*?*/ fSumSqr += fVal * fVal;
/*?*/ rValCount++;
@@ -2946,14 +2955,14 @@ void ScInterpreter::ScCountEmptyCells()
ScBaseCell* pCell;
ScCellIterator aDocIter(pDok, nCol1, nRow1, nTab1,
nCol2, nRow2, nTab2, glSubTotal);
- if (pCell = aDocIter.GetFirst())
+ if ((pCell = aDocIter.GetFirst()))
{
do
{
if ((eCellType = pCell->GetCellType()) != CELLTYPE_NONE
&& eCellType != CELLTYPE_NOTE)
nCount++;
- } while ( pCell = aDocIter.GetNext() );
+ } while (( pCell = aDocIter.GetNext() ));
}
}
break;
@@ -2969,7 +2978,7 @@ void ScInterpreter::ScCountEmptyCells()
if ( MustHaveParamCount( GetByte(), 2 ) )
{
String rString;
- double fVal;
+ double fVal(0.0);
BOOL bIsString = TRUE;
switch ( GetStackType() )
{
@@ -3129,7 +3138,7 @@ void ScInterpreter::ScCountEmptyCells()
}
}
String rString;
- double fVal;
+ double fVal(0.0);
BOOL bIsString = TRUE;
switch ( GetStackType() )
{
@@ -3304,7 +3313,7 @@ void ScInterpreter::ScCountEmptyCells()
USHORT nCol4 = 0;
USHORT nRow4 = 0;
USHORT nTab4 = 0;
- USHORT nDelta;
+ USHORT nDelta = 0;
// param 3: data range
if ( nParamCount == 3 )
@@ -3377,17 +3386,17 @@ void ScInterpreter::ScCountEmptyCells()
return;
}
BOOL bSpMatrix, bSpVector;
- USHORT nMatCount, nVecCount;
+ USHORT nLclMatCount, nVecCount;
if (pMat1 == NULL)
{
if (nRow1 == nRow2)
{
- nMatCount = nCol2 - nCol1 + 1;
+ nLclMatCount = nCol2 - nCol1 + 1;
bSpMatrix = FALSE;
}
else
{
- nMatCount = nRow2 - nRow1 + 1;
+ nLclMatCount = nRow2 - nRow1 + 1;
bSpMatrix = TRUE;
}
}
@@ -3395,18 +3404,18 @@ void ScInterpreter::ScCountEmptyCells()
{
if (nR1 == 1)
{
- nMatCount = nC1;
+ nLclMatCount = nC1;
bSpMatrix = FALSE;
}
else
{
- nMatCount = nR1;
+ nLclMatCount = nR1;
bSpMatrix = TRUE;
}
}
if ( nParamCount < 3 )
{
- nVecCount = nMatCount;
+ nVecCount = nLclMatCount;
bSpVector = bSpMatrix;
}
else if (pMat3 == NULL)
@@ -3435,7 +3444,7 @@ void ScInterpreter::ScCountEmptyCells()
bSpVector = TRUE;
}
}
- if (nGlobalError == 0 && nVecCount == nMatCount)
+ if (nGlobalError == 0 && nVecCount == nLclMatCount)
{
String sStr;
ScQueryParam rParam;
@@ -3518,7 +3527,7 @@ void ScInterpreter::ScCountEmptyCells()
sal_Int32 nRes;
String aParamStr = *rEntry.pStr;
USHORT i = 0;
- for ( i = 0; i < nMatCount; i++)
+ for ( i = 0; i < nLclMatCount; i++)
{
if (!pMat1->IsValue(i))
{
@@ -3530,10 +3539,10 @@ void ScInterpreter::ScCountEmptyCells()
nDelta = i;
}
else if (nRes == COMPARE_LESS)
- i = nMatCount+1;
+ i = nLclMatCount+1;
}
}
- if (i == nMatCount+2 && !bFound)
+ if (i == nLclMatCount+2 && !bFound)
{
SetNV();
return;
@@ -3546,7 +3555,7 @@ void ScInterpreter::ScCountEmptyCells()
BOOL bFound = FALSE;
double fVal1;
USHORT i = 0;
- for ( i = 0; i < nMatCount; i++)
+ for ( i = 0; i < nLclMatCount; i++)
{
if (pMat1->IsValue(i))
fVal1 = pMat1->GetDouble(i);
@@ -3558,9 +3567,9 @@ void ScInterpreter::ScCountEmptyCells()
nDelta = i;
}
else if (fVal1 > rEntry.nVal)
- i = nMatCount+1;
+ i = nLclMatCount+1;
}
- if (i == nMatCount+2 && !bFound)
+ if (i == nLclMatCount+2 && !bFound)
{
SetNV();
return;
@@ -3775,7 +3784,7 @@ void ScInterpreter::ScCountEmptyCells()
rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
if (pMat)
{
- USHORT nMatCount = nC;
+ USHORT nLclMatCount = nC;
short nDelta = -1;
if (rEntry.bQueryByString)
{
@@ -3786,13 +3795,13 @@ void ScInterpreter::ScCountEmptyCells()
USHORT i;
if ( bSorted )
{
- for (i = 0; i < nMatCount; i++)
+ for (i = 0; i < nLclMatCount; i++)
{
if (pMat->IsString(i, 0))
{
if ( ScGlobal::pTransliteration->isEqual(
pMat->GetString(i,0), aParamStr ) )
- i = nMatCount+1;
+ i = nLclMatCount+1;
else
nDelta = i;
}
@@ -3802,7 +3811,7 @@ void ScInterpreter::ScCountEmptyCells()
}
else
{
- for (i = 0; i < nMatCount; i++)
+ for (i = 0; i < nLclMatCount; i++)
{
if (pMat->IsString(i, 0))
{
@@ -3810,7 +3819,7 @@ void ScInterpreter::ScCountEmptyCells()
pMat->GetString(i,0), aParamStr ) )
{
nDelta = i;
- i = nMatCount + 1;
+ i = nLclMatCount + 1;
}
}
}
@@ -3822,7 +3831,7 @@ void ScInterpreter::ScCountEmptyCells()
USHORT i;
if ( bSorted )
{
- for (i = 0; i < nMatCount; i++)
+ for (i = 0; i < nLclMatCount; i++)
{
if (!pMat->IsString(i, 0))
fVal1 = pMat->GetDouble(i,0);
@@ -3831,12 +3840,12 @@ void ScInterpreter::ScCountEmptyCells()
if (fVal1 <= rEntry.nVal)
nDelta = i;
else
- i = nMatCount+1;
+ i = nLclMatCount+1;
}
}
else
{
- for (i = 0; i < nMatCount; i++)
+ for (i = 0; i < nLclMatCount; i++)
{
if (!pMat->IsString(i, 0))
fVal1 = pMat->GetDouble(i,0);
@@ -3845,7 +3854,7 @@ void ScInterpreter::ScCountEmptyCells()
if (fVal1 == rEntry.nVal)
{
nDelta = i;
- i = nMatCount + 1;
+ i = nLclMatCount + 1;
}
}
}
@@ -3864,7 +3873,7 @@ void ScInterpreter::ScCountEmptyCells()
{
rEntry.nField = nCol1;
BOOL bFound = FALSE;
- USHORT nC;
+ USHORT nLclC;
if ( bSorted )
rEntry.eOp = SC_LESS_EQUAL;
ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
@@ -3872,23 +3881,23 @@ void ScInterpreter::ScCountEmptyCells()
aCellIter.SetAdvanceQueryParamEntryField( TRUE );
if ( bSorted )
{
- USHORT nR;
- bFound = aCellIter.FindEqualOrSortedLastInRange( nC, nR );
+ USHORT nLclR;
+ bFound = aCellIter.FindEqualOrSortedLastInRange( nLclC, nLclR );
}
else if ( aCellIter.GetFirst() )
{
bFound = TRUE;
- nC = aCellIter.GetCol();
+ nLclC = aCellIter.GetCol();
if ( bSorted )
{
while ( aCellIter.GetNext() )
- nC = aCellIter.GetCol();
+ nLclC = aCellIter.GetCol();
}
}
if ( bFound )
{
ScBaseCell* pCell;
- ScAddress aAdr( nC, nZIndex, nTab1 );
+ ScAddress aAdr( nLclC, nZIndex, nTab1 );
if ( HasCellValueData( pCell = GetCell( aAdr ) ) )
PushDouble(GetCellValue( aAdr, pCell ));
else
@@ -4029,7 +4038,7 @@ void ScInterpreter::ScCountEmptyCells()
/*N*/ rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
/*N*/ if (pMat)
/*N*/ {
-/*?*/ USHORT nMatCount = nR;
+/*?*/ USHORT nLclMatCount = nR;
/*?*/ short nDelta = -1;
/*?*/ if (rEntry.bQueryByString)
/*?*/ {
@@ -4040,13 +4049,13 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ USHORT i;
/*?*/ if ( bSorted )
/*?*/ {
-/*?*/ for (i = 0; i < nMatCount; i++)
+/*?*/ for (i = 0; i < nLclMatCount; i++)
/*?*/ {
/*?*/ if (pMat->IsString(0, i))
/*?*/ {
/*?*/ if ( ScGlobal::pTransliteration->isEqual(
/*?*/ pMat->GetString(0,i), aParamStr ) )
-/*?*/ i = nMatCount+1;
+/*?*/ i = nLclMatCount+1;
/*?*/ else
/*?*/ nDelta = i;
/*?*/ }
@@ -4056,7 +4065,7 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ }
/*?*/ else
/*?*/ {
-/*?*/ for (i = 0; i < nMatCount; i++)
+/*?*/ for (i = 0; i < nLclMatCount; i++)
/*?*/ {
/*?*/ if (pMat->IsString(0, i))
/*?*/ {
@@ -4064,7 +4073,7 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ pMat->GetString(0,i), aParamStr ) )
/*?*/ {
/*?*/ nDelta = i;
-/*?*/ i = nMatCount + 1;
+/*?*/ i = nLclMatCount + 1;
/*?*/ }
/*?*/ }
/*?*/ }
@@ -4076,7 +4085,7 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ USHORT i;
/*?*/ if ( bSorted )
/*?*/ {
-/*?*/ for (i = 0; i < nMatCount; i++)
+/*?*/ for (i = 0; i < nLclMatCount; i++)
/*?*/ {
/*?*/ if (!pMat->IsString(0, i))
/*?*/ fVal1 = pMat->GetDouble(0, i);
@@ -4085,12 +4094,12 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ if (fVal1 <= rEntry.nVal)
/*?*/ nDelta = i;
/*?*/ else
-/*?*/ i = nMatCount+1;
+/*?*/ i = nLclMatCount+1;
/*?*/ }
/*?*/ }
/*?*/ else
/*?*/ {
-/*?*/ for (i = 0; i < nMatCount; i++)
+/*?*/ for (i = 0; i < nLclMatCount; i++)
/*?*/ {
/*?*/ if (!pMat->IsString(0, i))
/*?*/ fVal1 = pMat->GetDouble(0, i);
@@ -4099,7 +4108,7 @@ void ScInterpreter::ScCountEmptyCells()
/*?*/ if (fVal1 == rEntry.nVal)
/*?*/ {
/*?*/ nDelta = i;
-/*?*/ i = nMatCount + 1;
+/*?*/ i = nLclMatCount + 1;
/*?*/ }
/*?*/ }
/*?*/ }
@@ -4118,29 +4127,29 @@ void ScInterpreter::ScCountEmptyCells()
/*N*/ {
/*N*/ rEntry.nField = nCol1;
/*N*/ BOOL bFound = FALSE;
-/*N*/ USHORT nR;
+/*N*/ USHORT nLclR;
/*N*/ if ( bSorted )
/*N*/ rEntry.eOp = SC_LESS_EQUAL;
/*N*/ ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
/*N*/ if ( bSorted )
/*N*/ {
-/*N*/ USHORT nC;
-/*N*/ bFound = aCellIter.FindEqualOrSortedLastInRange( nC, nR );
+/*N*/ USHORT nLclC;
+/*N*/ bFound = aCellIter.FindEqualOrSortedLastInRange( nLclC, nLclR );
/*N*/ }
/*N*/ else if ( aCellIter.GetFirst() )
/*N*/ {
/*N*/ bFound = TRUE;
-/*N*/ nR = aCellIter.GetRow();
+/*N*/ nLclR = aCellIter.GetRow();
/*N*/ if ( bSorted )
/*N*/ {
/*?*/ while (aCellIter.GetNext())
-/*?*/ nR = aCellIter.GetRow();
+/*?*/ nLclR = aCellIter.GetRow();
/*N*/ }
/*N*/ }
/*N*/ if ( bFound )
/*N*/ {
/*N*/ ScBaseCell* pCell;
-/*N*/ ScAddress aAdr( nSpIndex, nR, nTab1 );
+/*N*/ ScAddress aAdr( nSpIndex, nLclR, nTab1 );
/*N*/ if ( HasCellValueData( pCell = GetCell( aAdr ) ) )
/*N*/ PushDouble(GetCellValue( aAdr, pCell ));
/*N*/ else
@@ -4386,6 +4395,7 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam,
case ifPRODUCT: nErg = 1; break;
case ifMAX: nErg = MINDOUBLE; break;
case ifMIN: nErg = MAXDOUBLE; break;
+ default: break;
}
do
{
@@ -4406,6 +4416,7 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam,
case ifPRODUCT: nErg *= nVal; break;
case ifMAX: if( nVal > nErg ) nErg = nVal; break;
case ifMIN: if( nVal < nErg ) nErg = nVal; break;
+ default: break;
}
}
while ( aValIter.GetNext(nVal, nErr) && !nErr );
@@ -4419,6 +4430,7 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam,
case ifCOUNT: nErg = nCount; break;
case ifSUM: nErg = ::rtl::math::approxAdd( nErg, fMem ); break;
case ifAVERAGE: nErg = ::rtl::math::approxAdd( nErg, fMem ) / nCount; break;
+ default: break;
}
PushDouble( nErg );
}
@@ -4659,7 +4671,7 @@ void ScInterpreter::ScOffset()
BYTE nParamCount = GetByte();
if ( MustHaveParamCount( nParamCount, 3, 5 ) )
{
- short nColNew, nRowNew, nColPlus, nRowPlus;
+ short nColNew(0), nRowNew(0), nColPlus, nRowPlus;
if (nParamCount == 5)
nColNew = (short) ::rtl::math::approxFloor(GetDouble());
if (nParamCount >= 4)
@@ -5402,7 +5414,7 @@ void ScInterpreter::ScConcat()
/*N*/ static const sal_Unicode cre[] = { '.','*','+','?','[',']','^','$','\\','<','>','(',')','|', 0 };
/*N*/ const sal_Unicode* p1 = rStr.GetBuffer();
/*N*/ sal_Unicode c1;
-/*N*/ while ( c1 = *p1++ )
+/*N*/ while (( c1 = *p1++ ))
/*N*/ {
/*N*/ const sal_Unicode* p2 = cre;
/*N*/ while ( *p2 )
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
index bb0eb81..bb1fcf3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
@@ -765,7 +765,7 @@ void ScInterpreter::ScBinomDist()
double p = GetDouble(); // p
double n = ::rtl::math::approxFloor(GetDouble()); // n
double x = ::rtl::math::approxFloor(GetDouble()); // x
- double fFactor, q, fSum;
+ double fFactor, q;
if (n < 0.0 || x < 0.0 || x > n || p < 0.0 || p > 1.0)
SetIllegalArgument();
else if (kum == 0.0) // Dichte
@@ -808,7 +808,7 @@ void ScInterpreter::ScBinomDist()
SetNoValue();
else
{
- fSum = 1.0 - fFactor;
+ double fSum = 1.0 - fFactor;
ULONG max = (ULONG) (n - x) - 1;
for (ULONG i = 0; i < max && fFactor > 0.0; i++)
{
@@ -1381,7 +1381,7 @@ void ScInterpreter::ScZTest()
BYTE nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
return;
- double sigma, mue, x;
+ double sigma(0.0), mue, x;
if (nParamCount == 3)
{
sigma = GetDouble();
@@ -1807,14 +1807,13 @@ void ScInterpreter::ScKurt()
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
return;
USHORT SaveSP = sp;
- USHORT i;
double fSum = 0.0;
double fSumSqr = 0.0;
double fCount = 0.0;
double fVal;
ScAddress aAdr;
ScRange aRange;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -1868,9 +1867,9 @@ void ScInterpreter::ScKurt()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nCount; k++)
{
- fVal = pMat->GetDouble(i);
+ fVal = pMat->GetDouble(k);
fSum += fVal;
fSumSqr += fVal*fVal;
fCount++;
@@ -1878,10 +1877,10 @@ void ScInterpreter::ScKurt()
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
{
- fVal = pMat->GetDouble(i);
+ fVal = pMat->GetDouble(k);
fSum += fVal;
fSumSqr += fVal*fVal;
fCount++;
@@ -1907,7 +1906,7 @@ void ScInterpreter::ScKurt()
// #55733# GCC Optimierungsfehler, GPF wenn die 4.0 als Konstante an pow()
// uebergeben wird, auch ein "const double fPow = 4.0;" GPF't,
double fPow = 4.0;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -1943,14 +1942,14 @@ void ScInterpreter::ScKurt()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
- fSum += pow(pMat->GetDouble(i) - fMean, fPow);
+ for (ULONG k = 0; k < nCount; k++)
+ fSum += pow(pMat->GetDouble(k) - fMean, fPow);
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
- fSum += pow(pMat->GetDouble(i) - fMean, fPow);
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
+ fSum += pow(pMat->GetDouble(k) - fMean, fPow);
}
}
}
@@ -2038,16 +2037,16 @@ void ScInterpreter::ScHarMean()
ScMatrix* pMat = PopMatrix();
if (pMat)
{
- ULONG nCount = pMat->GetElementCount();
+ ULONG nLclCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nLclCount; k++)
{
- double x = pMat->GetDouble(i);
+ double x = pMat->GetDouble(k);
if (x > 0.0)
{
nVal += 1.0/x;
- nCount++;
+ nLclCount++;
}
else
SetIllegalArgument();
@@ -2055,14 +2054,14 @@ void ScInterpreter::ScHarMean()
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nLclCount; k++)
+ if (!pMat->IsString(k))
{
- double x = pMat->GetDouble(i);
+ double x = pMat->GetDouble(k);
if (x > 0.0)
{
nVal += 1.0/x;
- nCount++;
+ nLclCount++;
}
else
SetIllegalArgument();
@@ -2153,16 +2152,16 @@ void ScInterpreter::ScGeoMean()
ScMatrix* pMat = PopMatrix();
if (pMat)
{
- ULONG nCount = pMat->GetElementCount();
+ ULONG nLclCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nLclCount; k++)
{
- double x = pMat->GetDouble(i);
+ double x = pMat->GetDouble(k);
if (x > 0.0)
{
nVal += log(x);
- nCount++;
+ nLclCount++;
}
else
SetIllegalArgument();
@@ -2170,14 +2169,14 @@ void ScInterpreter::ScGeoMean()
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nLclCount; k++)
+ if (!pMat->IsString(k))
{
- double x = pMat->GetDouble(i);
+ double x = pMat->GetDouble(k);
if (x > 0.0)
{
nVal += log(x);
- nCount++;
+ nLclCount++;
}
else
SetIllegalArgument();
@@ -2213,14 +2212,13 @@ void ScInterpreter::ScSkew()
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
return;
USHORT SaveSP = sp;
- USHORT i;
double fSum = 0.0;
double fSumSqr = 0.0;
double fCount = 0.0;
double fVal;
ScAddress aAdr;
ScRange aRange;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -2274,9 +2272,9 @@ void ScInterpreter::ScSkew()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nCount; k++)
{
- fVal = pMat->GetDouble(i);
+ fVal = pMat->GetDouble(k);
fSum += fVal;
fSumSqr += fVal*fVal;
fCount++;
@@ -2284,10 +2282,10 @@ void ScInterpreter::ScSkew()
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
{
- fVal = pMat->GetDouble(i);
+ fVal = pMat->GetDouble(k);
fSum += fVal;
fSumSqr += fVal*fVal;
fCount++;
@@ -2311,7 +2309,7 @@ void ScInterpreter::ScSkew()
sp = SaveSP;
fSum = 0.0;
double fPow = 3.0; // vorsichtshalber wg. #55733#, siehe ScKurt()
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -2347,14 +2345,14 @@ void ScInterpreter::ScSkew()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
- fSum += pow(pMat->GetDouble(i) - fMean, fPow);
+ for (ULONG k = 0; k < nCount; k++)
+ fSum += pow(pMat->GetDouble(k) - fMean, fPow);
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
- fSum += pow(pMat->GetDouble(i) - fMean, fPow);
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
+ fSum += pow(pMat->GetDouble(k) - fMean, fPow);
}
}
}
@@ -2541,7 +2539,7 @@ void ScInterpreter::ScModalValue()
#else
double* pSArray = pSortArray;
#endif
- ULONG nMaxIndex, nMax = 1, nCount = 1;
+ ULONG nMaxIndex(0), nMax = 1, nCount = 1;
double nOldVal = pSArray[0];
ULONG i = 0;
for (i = 1; i < nSize; i++)
@@ -2816,11 +2814,10 @@ void ScInterpreter::GetSortArray(BYTE nParamCount, double** ppSortArray, ULONG&
nSize = 0;
USHORT SaveSP = sp;
- USHORT i;
ULONG rValCount = 0;
ScAddress aAdr;
ScRange aRange;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -2862,8 +2859,8 @@ void ScInterpreter::GetSortArray(BYTE nParamCount, double** ppSortArray, ULONG&
rValCount += nCount;
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
rValCount++;
}
}
@@ -2899,7 +2896,7 @@ void ScInterpreter::GetSortArray(BYTE nParamCount, double** ppSortArray, ULONG&
}
sp = SaveSP;
ULONG nIndex = 0;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -2944,18 +2941,18 @@ void ScInterpreter::GetSortArray(BYTE nParamCount, double** ppSortArray, ULONG&
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nCount; k++)
{
- pSArray[nIndex] = pMat->GetDouble(i);
+ pSArray[nIndex] = pMat->GetDouble(k);
nIndex++;
}
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
{
- pSArray[nIndex] = pMat->GetDouble(i);
+ pSArray[nIndex] = pMat->GetDouble(k);
nIndex++;
}
}
@@ -3147,13 +3144,12 @@ void ScInterpreter::ScAveDev()
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
return;
USHORT SaveSP = sp;
- USHORT i;
double nMiddle = 0.0;
double rVal = 0.0;
double rValCount = 0.0;
ScAddress aAdr;
ScRange aRange;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -3200,18 +3196,18 @@ void ScInterpreter::ScAveDev()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
+ for (ULONG k = 0; k < nCount; k++)
{
- rVal += pMat->GetDouble(i);
+ rVal += pMat->GetDouble(k);
rValCount++;
}
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
{
- rVal += pMat->GetDouble(i);
+ rVal += pMat->GetDouble(k);
rValCount++;
}
}
@@ -3231,7 +3227,7 @@ void ScInterpreter::ScAveDev()
nMiddle = rVal / rValCount;
sp = SaveSP;
rVal = 0.0;
- for (i = 0; i < nParamCount; i++)
+ for (USHORT i = 0; i < nParamCount; i++)
{
switch (GetStackType())
{
@@ -3268,14 +3264,14 @@ void ScInterpreter::ScAveDev()
ULONG nCount = pMat->GetElementCount();
if (pMat->IsNumeric())
{
- for (ULONG i = 0; i < nCount; i++)
- rVal += fabs(pMat->GetDouble(i) - nMiddle);
+ for (ULONG k = 0; k < nCount; k++)
+ rVal += fabs(pMat->GetDouble(k) - nMiddle);
}
else
{
- for (ULONG i = 0; i < nCount; i++)
- if (!pMat->IsString(i))
- rVal += fabs(pMat->GetDouble(i) - nMiddle);
+ for (ULONG k = 0; k < nCount; k++)
+ if (!pMat->IsString(k))
+ rVal += fabs(pMat->GetDouble(k) - nMiddle);
}
}
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 052bcce..aab10b8 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -2570,13 +2570,13 @@ void ScInterpreter::ScTTT()
/*N*/ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
/*N*/ const ScAddress& rPos, ScTokenArray& r ) :
-/*N*/ pMyFormulaCell( pCell ),
-/*N*/ pDok( pDoc ),
/*N*/ aCode( r ),
/*N*/ aPos( rPos ),
/*N*/ rArr( r ),
-/*N*/ bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() ),
-/*N*/ pFormatter( pDoc->GetFormatTable() )
+/*N*/ pDok( pDoc ),
+/*N*/ pMyFormulaCell( pCell ),
+/*N*/ pFormatter( pDoc->GetFormatTable() ),
+/*N*/ bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() )
/*N*/ {
/*N*/ // pStack = new ScToken*[ MAXSTACK ];
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index c7b0f66..02b9fc6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -2882,14 +2882,13 @@ void ScInterpreter::ScRKP()
USHORT nCX, nRX, nCY, nRY, M, N;
pMatY->GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
- ULONG i;
- for (i = 0; i < nCountY; i++)
+ for (ULONG i = 0; i < nCountY; i++)
if (!pMatY->IsValue(i))
{
SetIllegalArgument();
return;
}
- for (i = 0; i < nCountY; i++)
+ for (ULONG i = 0; i < nCountY; i++)
{
if (pMatY->GetDouble(i) <= 0.0)
{
@@ -2903,7 +2902,7 @@ void ScInterpreter::ScRKP()
{
pMatX->GetDimensions(nCX, nRX);
ULONG nCountX = (ULONG) nCX * nRX;
- for (i = 0; i < nCountX; i++)
+ for (ULONG i = 0; i < nCountX; i++)
if (!pMatX->IsValue(i))
{
SetIllegalArgument();
@@ -3313,11 +3312,10 @@ void ScInterpreter::ScTrend()
return;
}
BYTE nCase; // 1 = normal, 2,3 = mehrfach
- USHORT nCX, nRX, nCY, nRY, M, N;
+ USHORT nCX, nRX, nCY, nRY, M(0), N(0);
pMatY->GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
- ULONG i;
- for (i = 0; i < nCountY; i++)
+ for (ULONG i = 0; i < nCountY; i++)
if (!pMatY->IsValue(i))
{
SetIllegalArgument();
@@ -3327,7 +3325,7 @@ void ScInterpreter::ScTrend()
{
pMatX->GetDimensions(nCX, nRX);
ULONG nCountX = (ULONG) nCX * nRX;
- for (i = 0; i < nCountX; i++)
+ for (ULONG i = 0; i < nCountX; i++)
if (!pMatX->IsValue(i))
{
SetIllegalArgument();
@@ -3376,7 +3374,7 @@ void ScInterpreter::ScTrend()
SetIllegalParameter();
return;
}
- for (i = 1; i <= nCountY; i++)
+ for (ULONG i = 1; i <= nCountY; i++)
pMatX->PutDouble((double)i, i-1);
nCase = 1;
}
@@ -3454,7 +3452,7 @@ void ScInterpreter::ScTrend()
SetIllegalParameter();
return;
}
- for (i = 0; i < nCountXN; i++)
+ for (ULONG i = 0; i < nCountXN; i++)
pResMat->PutDouble(pMatNewX->GetDouble(i)*m+b, i);
}
}
@@ -3665,17 +3663,16 @@ void ScInterpreter::ScGrowth()
return;
}
BYTE nCase; // 1 = normal, 2,3 = mehrfach
- USHORT nCX, nRX, nCY, nRY, M, N;
+ USHORT nCX, nRX, nCY, nRY, M(0), N(0);
pMatY->GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
- ULONG i;
- for (i = 0; i < nCountY; i++)
+ for (ULONG i = 0; i < nCountY; i++)
if (!pMatY->IsValue(i))
{
SetIllegalArgument();
return;
}
- for (i = 0; i < nCountY; i++)
+ for (ULONG i = 0; i < nCountY; i++)
{
if (pMatY->GetDouble(i) <= 0.0)
{
@@ -3738,7 +3735,7 @@ void ScInterpreter::ScGrowth()
SetIllegalParameter();
return;
}
- for (i = 1; i <= nCountY; i++)
+ for (ULONG i = 1; i <= nCountY; i++)
pMatX->PutDouble((double)i, i-1);
nCase = 1;
}
@@ -3816,7 +3813,7 @@ void ScInterpreter::ScGrowth()
SetIllegalParameter();
return;
}
- for (i = 0; i < nCountXN; i++)
+ for (ULONG i = 0; i < nCountXN; i++)
pResMat->PutDouble(exp(pMatNewX->GetDouble(i)*m+b), i);
}
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
index 47c2353..147cf91 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
@@ -125,7 +125,7 @@ namespace binfilter {
/*N*/ USHORT nRow2 = r.aEnd.Row();
/*N*/ USHORT nTab2 = r.aEnd.Tab();
/*N*/ ScRangePtr pOver = (ScRangePtr) &r; // fies aber wahr wenn bInList
-/*N*/ ULONG nOldPos;
+/*N*/ ULONG nOldPos(0);
/*N*/ if ( bIsInList )
/*N*/ { // merken um ggbf. zu loeschen bzw. wiederherzustellen
/*N*/ nOldPos = GetPos( pOver );
@@ -206,11 +206,11 @@ namespace binfilter {
/*N*/ BOOL ScRangeList::Store( SvStream& rStream ) const
/*N*/ {
/*N*/ BOOL bOk = TRUE;
-/*N*/ ULONG nCount = Count();
-/*N*/ ULONG nBytes = sizeof(UINT32) + nCount * sizeof(ScRange);
+/*N*/ ULONG nLclCount = Count();
+/*N*/ ULONG nBytes = sizeof(UINT32) + nLclCount * sizeof(ScRange);
/*N*/ ScWriteHeader aHdr( rStream, nBytes );
-/*N*/ rStream << (UINT32) nCount;
-/*N*/ for ( ULONG j = 0; j < nCount && bOk; j++ )
+/*N*/ rStream << (UINT32) nLclCount;
+/*N*/ for ( ULONG j = 0; j < nLclCount && bOk; j++ )
/*N*/ {
/*N*/ rStream << *GetObject( j );
/*N*/ if( rStream.GetError() != SVSTREAM_OK )
@@ -227,8 +227,8 @@ namespace binfilter {
/*N*/ ScRange aRange;
/*N*/ UINT32 n;
/*N*/ rStream >> n;
-/*N*/ ULONG nCount = n;
-/*N*/ for ( ULONG j = 0; j < nCount && bOk; j++ )
+/*N*/ ULONG nLclCount = n;
+/*N*/ for ( ULONG j = 0; j < nLclCount && bOk; j++ )
/*N*/ {
/*N*/ rStream >> aRange;
/*N*/ Append( aRange );
@@ -273,9 +273,11 @@ namespace binfilter {
/*N*/ ScRangeList::ScRangeList( const ScRangeList& rList )
+/*N*/ : ScRangeListBase()
+/*N*/ , SvRefBase()
/*N*/ {
-/*N*/ ULONG nCount = rList.Count();
-/*N*/ for ( ULONG j = 0; j < nCount; j++ )
+/*N*/ ULONG nLclCount = rList.Count();
+/*N*/ for ( ULONG j = 0; j < nLclCount; j++ )
/*N*/ Append( *rList.GetObject( j ) );
/*N*/ }
@@ -286,8 +288,8 @@ namespace binfilter {
/*N*/ {
/*N*/ RemoveAll();
/*N*/
-/*N*/ ULONG nCount = rList.Count();
-/*N*/ for ( ULONG j = 0; j < nCount; j++ )
+/*N*/ ULONG nLclCount = rList.Count();
+/*N*/ for ( ULONG j = 0; j < nLclCount; j++ )
/*N*/ Append( *rList.GetObject( j ) );
/*N*/
/*N*/ return *this;
@@ -325,7 +327,7 @@ namespace binfilter {
/*N*/ USHORT nRow2 = r1.aEnd.Row();
/*N*/ USHORT nTab2 = r1.aEnd.Tab();
/*N*/ ScRangePair* pOver = (ScRangePair*) &r; // fies aber wahr wenn bInList
-/*N*/ ULONG nOldPos;
+/*N*/ ULONG nOldPos(0);
/*N*/ if ( bIsInList )
/*N*/ { // merken um ggbf. zu loeschen bzw. wiederherzustellen
/*N*/ nOldPos = GetPos( pOver );
@@ -425,11 +427,11 @@ namespace binfilter {
/*N*/ BOOL ScRangePairList::Store( SvStream& rStream ) const
/*N*/ {
/*N*/ BOOL bOk = TRUE;
-/*N*/ ULONG nCount = Count();
-/*N*/ ULONG nBytes = sizeof(UINT32) + nCount * sizeof(ScRangePair);
+/*N*/ ULONG nLclCount = Count();
+/*N*/ ULONG nBytes = sizeof(UINT32) + nLclCount * sizeof(ScRangePair);
/*N*/ ScWriteHeader aHdr( rStream, nBytes );
-/*N*/ rStream << (UINT32) nCount;
-/*N*/ for ( ULONG j = 0; j < nCount && bOk; j++ )
+/*N*/ rStream << (UINT32) nLclCount;
+/*N*/ for ( ULONG j = 0; j < nLclCount && bOk; j++ )
/*N*/ {
/*N*/ rStream << *GetObject( j );
/*N*/ if( rStream.GetError() != SVSTREAM_OK )
@@ -447,8 +449,8 @@ namespace binfilter {
/*N*/ ScRange aRange;
/*N*/ UINT32 n;
/*N*/ rStream >> n;
-/*N*/ ULONG nCount = n;
-/*N*/ for ( ULONG j = 0; j < nCount && bOk; j++ )
+/*N*/ ULONG nLclCount = n;
+/*N*/ for ( ULONG j = 0; j < nLclCount && bOk; j++ )
/*N*/ {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list