[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 31 13:18:31 PST 2010
binfilter/bf_sc/source/core/data/sc_bclist.cxx | 2 -
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 26 +++++++++++-----------
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 14 +++++------
binfilter/bf_sc/source/core/data/sc_sortparam.cxx | 4 +--
binfilter/bf_sc/source/core/data/sc_table5.cxx | 2 +
binfilter/bf_sc/source/core/data/sc_validat.cxx | 5 ++--
binfilter/bf_sc/source/ui/src/makefile.mk | 1
binfilter/inc/bf_sc/chgtrack.hxx | 16 ++++++-------
8 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit e7add6e6d6179bb9236fc1f46646f9293443f613
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 31 21:18:26 2010 +0000
throw out some more warnings
diff --git a/binfilter/bf_sc/source/core/data/sc_bclist.cxx b/binfilter/bf_sc/source/core/data/sc_bclist.cxx
index d6f49bf..5b26443 100644
--- a/binfilter/bf_sc/source/core/data/sc_bclist.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_bclist.cxx
@@ -155,8 +155,6 @@ namespace binfilter {
/*N*/ void ScBroadcasterList::MoveListenersTo( ScBroadcasterList& rNew )
/*N*/ {
-/*N*/ SfxBroadcaster* pNewBC = &rNew.aFirstBC;
-/*N*/
/*N*/ USHORT nLstCount, nLstPos;
/*N*/ nLstCount = aFirstBC.GetListenerCount();
/*N*/ for (nLstPos=nLstCount; nLstPos>0;)
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 7cc5272..a5c60bd 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -545,11 +545,11 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
-/*N*/ const ScRange& r,
-/*N*/ short nDx, short nDy, short nDz,
-/*N*/ ScDocument* pUndoDoc )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*N*/ void ScFormulaCell::UpdateReference(UpdateRefMode /*eUpdateRefMode*/,
+/*N*/ const ScRange& /*r*/,
+/*N*/ short /*nDx*/, short /*nDy*/, short /*nDz*/,
+/*N*/ ScDocument* /*pUndoDoc*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void ScFormulaCell::UpdateInsertTab(USHORT nTable)
@@ -567,7 +567,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ pRangeData = aComp.UpdateInsertTab( nTable, FALSE );
/*N*/ if (pRangeData) // Shared Formula gegen echte Formel
/*N*/ { // austauschen
-/*?*/ BOOL bChanged;
+/*?*/ BOOL bLclChanged;
/*?*/ pDocument->RemoveFromFormulaTree( this ); // update formula count
/*?*/ delete pCode;
/*?*/ pCode = new ScTokenArray( *pRangeData->GetCode() );
@@ -577,7 +577,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*?*/ aComp2.UpdateInsertTab( nTable, FALSE );
/*?*/ // If the shared formula contained a named range/formula containing
/*?*/ // an absolute reference to a sheet, those have to be readjusted.
-/*?*/ aComp2.UpdateDeleteTab( nTable, FALSE, TRUE, bChanged );
+/*?*/ aComp2.UpdateDeleteTab( nTable, FALSE, TRUE, bLclChanged );
/*?*/ bCompile = TRUE;
/*N*/ }
/*N*/ // kein StartListeningTo weil pTab[nTab] noch nicht existiert!
@@ -588,7 +588,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ BOOL ScFormulaCell::UpdateDeleteTab(USHORT nTable, BOOL bIsMove)
/*N*/ {
-/*N*/ BOOL bChanged = FALSE;
+/*N*/ BOOL bLclChanged = FALSE;
/*N*/ BOOL bPosChanged = ( aPos.Tab() > nTable ? TRUE : FALSE );
/*N*/ pCode->Reset();
/*N*/ if( pCode->GetNextReferenceRPN() && !pDocument->IsClipOrUndo() )
@@ -599,7 +599,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ aPos.IncTab(-1);
/*N*/ ScRangeData* pRangeData;
/*N*/ ScCompiler aComp(pDocument, aPos, *pCode);
-/*N*/ pRangeData = aComp.UpdateDeleteTab(nTable, bIsMove, FALSE, bChanged);
+/*N*/ pRangeData = aComp.UpdateDeleteTab(nTable, bIsMove, FALSE, bLclChanged);
/*N*/ if (pRangeData) // Shared Formula gegen echte Formel
/*N*/ { // austauschen
/*N*/ pDocument->RemoveFromFormulaTree( this ); // update formula count
@@ -609,12 +609,12 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ ScCompiler aComp2(pDocument, aPos, *pCode);
/*N*/ aComp2.CompileTokenArray();
/*N*/ aComp2.MoveRelWrap();
-/*N*/ aComp2.UpdateDeleteTab( nTable, FALSE, FALSE, bChanged );
+/*N*/ aComp2.UpdateDeleteTab( nTable, FALSE, FALSE, bLclChanged );
/*N*/ // If the shared formula contained a named range/formula containing
/*N*/ // an absolute reference to a sheet, those have to be readjusted.
/*N*/ aComp2.UpdateInsertTab( nTable,TRUE );
-/*N*/ // bChanged kann beim letzten UpdateDeleteTab zurueckgesetzt worden sein
-/*N*/ bChanged = TRUE;
+/*N*/ // bLclChanged kann beim letzten UpdateDeleteTab zurueckgesetzt worden sein
+/*N*/ bLclChanged = TRUE;
/*N*/ bCompile = TRUE;
/*N*/ }
/*N*/ // kein StartListeningTo weil pTab[nTab] noch nicht korrekt!
@@ -622,7 +622,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
/*N*/ else if ( bPosChanged )
/*N*/ aPos.IncTab(-1);
/*N*/
-/*N*/ return bChanged;
+/*N*/ return bLclChanged;
/*N*/ }
/*N*/ BOOL ScFormulaCell::TestTabRefAbs(USHORT nTable)
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 4867adf..1af7df2 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -396,9 +396,9 @@ namespace binfilter {
/*N*/ }
-/*N*/ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, pTimer )
+/*N*/ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return 0;
/*N*/ }
@@ -1241,7 +1241,7 @@ namespace binfilter {
/*N*/
/*N*/ if (bValid)
/*N*/ {
-/*N*/ BOOL bOldAutoCalcSrc;
+/*N*/ BOOL bOldAutoCalcSrc = FALSE;
/*N*/ BOOL bOldAutoCalc = GetAutoCalc();
/*N*/ SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
/*N*/ SetNoListening( TRUE );
@@ -1375,18 +1375,18 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ for (USHORT i = 0; i < nSrcRange
/*N*/ ScFieldEditEngine* ScDocument::CreateFieldEditEngine()
/*N*/ {
-/*N*/ ScFieldEditEngine* pEditEngine = NULL;
+/*N*/ ScFieldEditEngine* pLclEditEngine = NULL;
/*N*/ if (!pCacheFieldEditEngine)
/*N*/ {
-/*N*/ pEditEngine = new ScFieldEditEngine( GetEnginePool(),
+/*N*/ pLclEditEngine = new ScFieldEditEngine( GetEnginePool(),
/*N*/ GetEditPool(), FALSE );
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ pEditEngine = pCacheFieldEditEngine;
+/*N*/ pLclEditEngine = pCacheFieldEditEngine;
/*N*/ pCacheFieldEditEngine = NULL;
/*N*/ }
-/*N*/ return pEditEngine;
+/*N*/ return pLclEditEngine;
/*N*/ }
/*N*/ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine)
diff --git a/binfilter/bf_sc/source/core/data/sc_sortparam.cxx b/binfilter/bf_sc/source/core/data/sc_sortparam.cxx
index 10ec7a9..d8362ae 100644
--- a/binfilter/bf_sc/source/core/data/sc_sortparam.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_sortparam.cxx
@@ -46,8 +46,8 @@ namespace binfilter {
/*N*/ ScSortParam::ScSortParam( const ScSortParam& r ) :
/*N*/ nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),
-/*N*/ bHasHeader(r.bHasHeader),bCaseSens(r.bCaseSens),
-/*N*/ bByRow(r.bByRow),bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
+/*N*/ bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens),
+/*N*/ bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
/*N*/ bInplace(r.bInplace),
/*N*/ nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
/*N*/ aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( r.aCollatorAlgorithm )
diff --git a/binfilter/bf_sc/source/core/data/sc_table5.cxx b/binfilter/bf_sc/source/core/data/sc_table5.cxx
index 44da940..a445231 100644
--- a/binfilter/bf_sc/source/core/data/sc_table5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table5.cxx
@@ -353,6 +353,8 @@ namespace binfilter {
/*?*/ case CELLTYPE_FORMULA :
/*?*/ ((ScFormulaCell*)pCell)->SetDirty();
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*?*/ }
/*?*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx
index 04800c8..69ace85 100644
--- a/binfilter/bf_sc/source/core/data/sc_validat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx
@@ -221,14 +221,15 @@ namespace binfilter {
/*N*/ return bShowError;
/*N*/ }
-/*N*/ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const
+/*N*/ BOOL ScValidationData::IsDataValid( ScBaseCell* /*pCell*/, const ScAddress& /*rPos*/ ) const
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 double nVal = 0.0;
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
//------------------------------------------------------------------------
/*N*/ ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList)
+/*N*/ : ScValidationEntries_Impl()
/*N*/ {
/*N*/ // fuer Ref-Undo - echte Kopie mit neuen Tokens!
/*N*/
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index 026cbea..a91c3a5 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -160,7 +160,7 @@ public:
{
if ( ppPrev )
{
- if ( *ppPrev = pNext )
+ if (( *ppPrev = pNext ))
pNext->ppPrev = ppPrev;
ppPrev = NULL; // not inserted
}
@@ -171,7 +171,7 @@ public:
if ( !ppPrev )
{
ppPrev = ppPrevP;
- if ( pNext = *ppPrevP )
+ if (( pNext = *ppPrevP ))
pNext->ppPrev = &pNext;
*ppPrevP = this;
}
@@ -427,7 +427,7 @@ public:
/*N*/ // eine Spalte/Zeile beruecksichtigt (fuer
/*N*/ // Auflistung der einzelnen Eintraege).
/*N*/ virtual void GetDescription( String&, ScDocument*,
-/*N*/ BOOL bSplitRange = FALSE ) const {}
+/*N*/ BOOL /*bSplitRange*/ = FALSE ) const {}
/*N*/
/*N*/ virtual void GetRefString( String&, ScDocument*,
/*N*/ BOOL bFlag3D = FALSE ) const;
@@ -497,12 +497,12 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry
ScChangeActionDelMoveEntry(
- ScChangeActionDelMoveEntry** ppPrev,
+ ScChangeActionDelMoveEntry** ppInPrev,
ScChangeActionMove* pMove,
short nFrom, short nTo )
: ScChangeActionLinkEntry(
(ScChangeActionLinkEntry**)
- ppPrev,
+ ppInPrev,
(ScChangeAction*) pMove ),
nCutOffFrom( nFrom ),
nCutOffTo( nTo )
@@ -728,7 +728,7 @@ class ScChangeActionContent : public ScChangeAction
/*N*/ if ( !ppPrevInSlot )
/*N*/ {
/*N*/ ppPrevInSlot = pp;
-/*N*/ if ( pNextInSlot = *pp )
+/*N*/ if (( pNextInSlot = *pp ))
/*N*/ pNextInSlot->ppPrevInSlot = &pNextInSlot;
/*N*/ *pp = this;
/*N*/ }
@@ -737,7 +737,7 @@ class ScChangeActionContent : public ScChangeAction
/*N*/ {
/*N*/ if ( ppPrevInSlot )
/*N*/ {
-/*N*/ if ( *ppPrevInSlot = pNextInSlot )
+/*N*/ if (( *ppPrevInSlot = pNextInSlot ))
/*N*/ pNextInSlot->ppPrevInSlot = ppPrevInSlot;
/*N*/ ppPrevInSlot = NULL; // not inserted
/*N*/ }
@@ -901,7 +901,7 @@ class ScChangeActionReject : public ScChangeAction
/*N*/ virtual void AddContent( ScChangeActionContent* ) {}
/*N*/ virtual void DeleteCellEntries() {}
/*N*/
-/*N*/ virtual BOOL Reject( ScDocument* p ) { return FALSE; }
+/*N*/ virtual BOOL Reject( ScDocument* /*p*/ ) { return FALSE; }
/*N*/
/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const;
/*N*/
commit ae4cb6d80b2d068f479d950f14f3f2e2b5083819
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 31 21:08:46 2010 +0000
WaE: make this dir warning free
diff --git a/binfilter/bf_sc/source/ui/src/makefile.mk b/binfilter/bf_sc/source/ui/src/makefile.mk
index 06e9af7..6c2cb3e 100644
--- a/binfilter/bf_sc/source/ui/src/makefile.mk
+++ b/binfilter/bf_sc/source/ui/src/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
More information about the Libreoffice-commits
mailing list