[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Jan 1 12:44:28 PST 2011
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 14 ++---
binfilter/bf_sc/source/core/data/sc_column2.cxx | 37 +++++---------
binfilter/bf_sc/source/core/data/sc_conditio.cxx | 25 +++++----
binfilter/bf_sc/source/core/data/sc_dociter.cxx | 56 ++++------------------
binfilter/bf_sc/source/core/data/sc_documen4.cxx | 8 +--
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 37 ++++++--------
binfilter/bf_sc/source/core/data/sc_dpsave.cxx | 35 ++++++-------
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx | 12 +---
binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx | 24 ++++-----
binfilter/bf_sc/source/core/data/sc_drawpage.cxx | 4 -
binfilter/bf_sc/source/core/data/sc_markdata.cxx | 4 -
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 4 -
binfilter/bf_sc/source/core/data/sc_stlpool.cxx | 12 ++--
binfilter/bf_sc/source/core/data/sc_stlsheet.cxx | 28 +++++------
binfilter/bf_sc/source/core/data/sc_table3.cxx | 10 ++-
binfilter/bf_sc/source/core/data/sc_table5.cxx | 2
binfilter/bf_sc/source/core/data/sc_userdat.cxx | 4 -
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 33 ++++++------
binfilter/inc/bf_sc/dpshttab.hxx | 1
binfilter/inc/bf_sc/dptabdat.hxx | 1
binfilter/inc/bf_sc/dptabres.hxx | 17 ++----
binfilter/inc/bf_sw/edimp.hxx | 4 -
23 files changed, 161 insertions(+), 213 deletions(-)
New commits:
commit 178c448da3f066d0ef04a477dad6e3f41523902a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 1 20:44:04 2011 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index 1722c99..2044123 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -70,7 +70,7 @@ namespace binfilter {
/*N*/ nTab( nNewTab ),
/*N*/ pDocument( pDoc )
/*N*/ {
-/*N*/ ScDocumentPool* pDocPool = pDocument->GetPool();
+/*N*/ /*ScDocumentPool* pDocPool =*/ pDocument->GetPool();
/*N*/
/*N*/ nCount = nLimit = 1;
/*N*/ pData = new ScAttrEntry[1];
@@ -986,9 +986,9 @@ namespace binfilter {
// Bereich loeschen, aber Merge-Flags stehenlassen
-/*N*/ void ScAttrArray::DeleteAreaSafe(USHORT nStartRow, USHORT nEndRow)
+/*N*/ void ScAttrArray::DeleteAreaSafe(USHORT, USHORT)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), TRUE );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -1392,8 +1392,8 @@ namespace binfilter {
/*N*/ if (pData)
/*N*/ {
/*N*/ BOOL bFirst=TRUE;
-/*N*/ USHORT nStartIndex;
-/*N*/ USHORT nEndIndex;
+/*N*/ USHORT nStartIndex(0);
+/*N*/ USHORT nEndIndex(0);
/*N*/ USHORT i = 0;
/*N*/ for (i = 0; i < nCount-1; i++)
/*N*/ if (pData[i].nRow >= nStartRow && pData[i].nRow <= nStartRow+nSize-1)
@@ -1460,9 +1460,9 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScAttrArray::DeleteHardAttr(USHORT nStartRow, USHORT nEndRow)
+/*N*/ void ScAttrArray::DeleteHardAttr(USHORT, USHORT)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ScPatternAttr* pDefPattern = pDocument->GetDefPattern();
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
// Verschieben innerhalb eines Dokuments
diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx
index 9587e8b..9db91e9 100644
--- a/binfilter/bf_sc/source/core/data/sc_column2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx
@@ -201,13 +201,6 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTab )
-{
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pDBColl = pDocument->GetDBCollection();
-
- return FALSE;
-}
-
/*N*/ void ScColumn::SaveData( SvStream& rStream ) const
/*N*/ {
/*N*/ CellType eCellType;
@@ -236,20 +229,11 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa
/*N*/ // Zellen abziehen, die wegen Import nicht gespeichert werden
/*N*/ BOOL bRemoveAny = lcl_RemoveAny( pDocument, nCol, nTab );
/*N*/ USHORT nEffCount = nSaveCount;
-/*N*/ if ( bRemoveAny )
-/*N*/ {
-/*?*/ for (i=0; i<nSaveCount; i++)
-/*?*/ if ( lcl_RemoveThis( pDocument, nCol, pItems[i].nRow, nTab ) )
-/*?*/ --nEffCount;
-/*?*/
-/*?*/ // String aDbg("Tab ");aDbg+=nTab;aDbg+=" Col ";aDbg+=nCol;
-/*?*/ // aDbg+=" Remove ";aDbg+=nSaveCount-nEffCount; DBG_ERROR(aDbg);
-/*N*/ }
/*N*/
/*N*/ rStream << nEffCount; // nEffCount: Zellen, die wirklich gespeichert werden
/*N*/
/*N*/ ScAttrIterator aIter( pAttrArray, 0, MAXROW );
-/*N*/ USHORT nStt, nEnd;
+/*N*/ USHORT nStt(0), nEnd(0);
/*N*/ const ScPatternAttr* pAttr;
/*N*/ do
/*N*/ {
@@ -263,7 +247,7 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa
/*N*/ {
/*N*/ USHORT nRow = pItems[i].nRow;
/*N*/
-/*N*/ if ( !bRemoveAny || !lcl_RemoveThis( pDocument, nCol, nRow, nTab ) )
+/*N*/ if ( !bRemoveAny || true )
/*N*/ {
/*N*/ rStream << nRow;
/*N*/
@@ -384,7 +368,7 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa
/*?*/ nNoteCount = 0;
/*?*/ for (i=0; i<nCount; i++)
/*?*/ if ( pItems[i].pCell->GetNotePtr() && pItems[i].nRow<=nSaveMaxRow &&
-/*?*/ !lcl_RemoveThis( pDocument, nCol, pItems[i].nRow, nTab ) )
+/*?*/ true )
/*?*/ ++nNoteCount;
/*N*/ }
/*N*/ else
@@ -401,7 +385,7 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa
/*N*/ for (i=0; i<nCount && rStream.GetError() == SVSTREAM_OK; i++)
/*N*/ {
/*N*/ USHORT nRow = pItems[i].nRow;
-/*N*/ if ( !bRemoveAny || !lcl_RemoveThis( pDocument, nCol, nRow, nTab ) )
+/*N*/ if ( !bRemoveAny || true )
/*N*/ {
/*N*/ const ScPostIt* pNote = pItems[i].pCell->GetNotePtr();
/*N*/ if ( pNote && nRow <= nSaveMaxRow )
@@ -528,7 +512,7 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa
/*N*/ ScFontToSubsFontConverter_AutoPtr xFontConverter;
/*N*/ const ULONG nFontConverterFlags = FONTTOSUBSFONT_IMPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS;
/*N*/ ScSymbolStringCellEntry* pE;
-/*N*/ USHORT nStt, nEnd;
+/*N*/ USHORT nStt(0), nEnd(0);
/*N*/
/*N*/ ScAttrIterator aIter( pAttrArray, 0, MAXROW );
/*N*/ const ScPatternAttr* pAttr = aIter.Next( nStt, nEnd );
@@ -906,7 +890,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ double nCosAbs = fabs( cos( nRealOrient ) );
/*?*/ double nSinAbs = fabs( sin( nRealOrient ) );
/*?*/ long nHeight = (long)( aSize.Height() * nCosAbs + aSize.Width() * nSinAbs );
-/*?*/ long nWidth;
+/*?*/ long nWidth(0);
/*?*/ if ( eRotMode == SVX_ROTATE_MODE_STANDARD )
/*?*/ nWidth = (long)( aSize.Width() * nCosAbs + aSize.Height() * nSinAbs );
/*?*/ else if ( rOptions.bTotalSize )
@@ -1655,7 +1639,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->Ge
/*N*/ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
/*N*/ {
-/*N*/ double nValue;
+/*N*/ double nValue(0.0);
/*N*/ BOOL bVal = FALSE;
/*N*/ BOOL bCell = TRUE;
/*N*/ switch (pCell->GetCellType())
@@ -1686,7 +1670,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->Ge
/*?*/ case CELLTYPE_NOTE:
/*?*/ bCell = FALSE;
/*?*/ break;
-/*?*/ // bei Strings nichts
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/
/*N*/ if (!rData.bError)
@@ -1720,6 +1705,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->Ge
/*?*/ if (++rData.nCount == 1 || nValue < rData.nVal )
/*?*/ rData.nVal = nValue;
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
@@ -1776,6 +1763,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->Ge
/*N*/ case CELLTYPE_EDIT:
/*N*/ nTotal += 50;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
index 0332907..bab4ac9 100644
--- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
@@ -96,14 +96,14 @@ namespace binfilter {
/*N*/ aStrVal2(r.aStrVal2),
/*N*/ bIsStr1(r.bIsStr1),
/*N*/ bIsStr2(r.bIsStr2),
-/*N*/ bRelRef1(r.bRelRef1),
-/*N*/ bRelRef2(r.bRelRef2),
/*N*/ pFormula1(NULL),
/*N*/ pFormula2(NULL),
+/*N*/ aSrcPos(r.aSrcPos),
/*N*/ pFCell1(NULL),
/*N*/ pFCell2(NULL),
/*N*/ pDoc(r.pDoc),
-/*N*/ aSrcPos(r.aSrcPos),
+/*N*/ bRelRef1(r.bRelRef1),
+/*N*/ bRelRef2(r.bRelRef2),
/*N*/ bFirstRun(TRUE)
/*N*/ {
/*N*/ // ScTokenArray copy ctor erzeugt flache Kopie
@@ -125,14 +125,14 @@ namespace binfilter {
/*N*/ aStrVal2(r.aStrVal2),
/*N*/ bIsStr1(r.bIsStr1),
/*N*/ bIsStr2(r.bIsStr2),
-/*N*/ bRelRef1(r.bRelRef1),
-/*N*/ bRelRef2(r.bRelRef2),
/*N*/ pFormula1(NULL),
/*N*/ pFormula2(NULL),
+/*N*/ aSrcPos(r.aSrcPos),
/*N*/ pFCell1(NULL),
/*N*/ pFCell2(NULL),
/*N*/ pDoc(pDocument),
-/*N*/ aSrcPos(r.aSrcPos),
+/*N*/ bRelRef1(r.bRelRef1),
+/*N*/ bRelRef2(r.bRelRef2),
/*N*/ bFirstRun(TRUE)
/*N*/ {
/*N*/ // echte Kopie der Formeln (fuer Ref-Undo)
@@ -156,14 +156,14 @@ namespace binfilter {
/*N*/ nVal2(0.0),
/*N*/ bIsStr1(FALSE),
/*N*/ bIsStr2(FALSE),
-/*N*/ bRelRef1(FALSE),
-/*N*/ bRelRef2(FALSE),
/*N*/ pFormula1(NULL),
/*N*/ pFormula2(NULL),
+/*N*/ aSrcPos(rPos),
/*N*/ pFCell1(NULL),
/*N*/ pFCell2(NULL),
/*N*/ pDoc(pDocument),
-/*N*/ aSrcPos(rPos),
+/*N*/ bRelRef1(FALSE),
+/*N*/ bRelRef2(FALSE),
/*N*/ bFirstRun(TRUE)
/*N*/ {
/*N*/ Compile( rExpr1, rExpr2, bCompileEnglish, bCompileXML, FALSE );
@@ -186,13 +186,13 @@ namespace binfilter {
/*N*/ nVal2(0.0),
/*N*/ bIsStr1(FALSE),
/*N*/ bIsStr2(FALSE),
-/*N*/ bRelRef1(FALSE),
-/*N*/ bRelRef2(FALSE),
/*N*/ pFormula1(NULL),
/*N*/ pFormula2(NULL),
/*N*/ pFCell1(NULL),
/*N*/ pFCell2(NULL),
/*N*/ pDoc(pDocument),
+/*N*/ bRelRef1(FALSE),
+/*N*/ bRelRef2(FALSE),
/*N*/ bFirstRun(TRUE)
/*N*/ {
/*N*/ USHORT nVer = (USHORT) pDoc->GetSrcVersion();
@@ -878,7 +878,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScConditionEntry::DataChanged( const ScRange* pModified ) const
+/*N*/ void ScConditionEntry::DataChanged( const ScRange* /*pModified*/ ) const
/*N*/ {
/*N*/ // nix
/*N*/ }
@@ -1273,6 +1273,7 @@ namespace binfilter {
//------------------------------------------------------------------------
/*N*/ ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList)
+/*N*/ : ScConditionalFormats_Impl()
/*N*/ {
/*N*/ // fuer Ref-Undo - echte Kopie mit neuen Tokens!
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_dociter.cxx b/binfilter/bf_sc/source/core/data/sc_dociter.cxx
index 15374df..52bcf77 100644
--- a/binfilter/bf_sc/source/core/data/sc_dociter.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dociter.cxx
@@ -41,28 +41,19 @@
#include "docoptio.hxx"
namespace binfilter {
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
- USHORT& nAttrEndRow, const ScAttrArray* pNewArr, USHORT nRow,
- ScDocument* pDoc )
-{
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( rpArr != pNewArr || nAttrEndRow < nRow )
-}
-
/*N*/ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange,
/*N*/ BOOL bSTotal, BOOL bTextZero ) :
/*N*/ pDoc( pDocument ),
+/*N*/ nNumFmtIndex(0),
/*N*/ nStartCol( rRange.aStart.Col() ),
/*N*/ nStartRow( rRange.aStart.Row() ),
/*N*/ nStartTab( rRange.aStart.Tab() ),
/*N*/ nEndCol( rRange.aEnd.Col() ),
/*N*/ nEndRow( rRange.aEnd.Row() ),
/*N*/ nEndTab( rRange.aEnd.Tab() ),
-/*N*/ bSubTotal(bSTotal),
/*N*/ nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-/*N*/ nNumFmtIndex(0),
/*N*/ bNumValid( FALSE ),
+/*N*/ bSubTotal(bSTotal),
/*N*/ bNextValid( FALSE ),
/*N*/ bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ),
/*N*/ bTextAsZero( bTextZero )
@@ -136,13 +127,6 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
/*N*/ --nRow;
/*N*/ if ( bCalcAsShown )
/*N*/ {
-/*?*/ #ifndef WTC
-/*?*/ lcl_IterGetNumberFormat( nNumFormat,pAttrArray,
-/*?*/ #else
-/*?*/ lcl_IterGetNumberFormat( nNumFormat,
-/*?*/ (ScAttrArray const *&)pAttrArray,
-/*?*/ #endif
-/*?*/ nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
/*?*/ rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
/*N*/ }
/*N*/ //
@@ -159,13 +143,6 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
/*N*/ bNextValid = TRUE;
/*N*/ if ( bCalcAsShown )
/*N*/ {
-/*?*/ #ifndef WTC
-/*?*/ lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
-/*?*/ #else
-/*?*/ lcl_IterGetNumberFormat( nNumFormat,
-/*?*/ (ScAttrArray const *&)pAttrArray,
-/*?*/ #endif
-/*?*/ nAttrEndRow, pCol->pAttrArray, nNextRow, pDoc );
/*?*/ fNextValue = pDoc->RoundValueAsShown( fNextValue, nNumFormat );
/*N*/ }
/*N*/ }
@@ -203,6 +180,8 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
/*N*/ }
/*N*/ }
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
@@ -273,11 +252,11 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
//------------------------------------------------------------------------
/*N*/ ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, USHORT nTable, const ScQueryParam& rParam) :
+/*N*/ aParam (rParam),
/*N*/ pDoc( pDocument ),
+/*N*/ nNumFmtIndex(0),
/*N*/ nTab( nTable),
-/*N*/ aParam (rParam),
/*N*/ nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-/*N*/ nNumFmtIndex(0),
/*N*/ bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() )
/*N*/ {
/*N*/ nCol = aParam.nCol1;
@@ -339,13 +318,6 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/ rValue = ((ScValueCell*)pCell)->GetValue();
/*N*/ if ( bCalcAsShown )
/*N*/ {
-/*N*/ #if ! ( defined WTC || defined ICC || defined HPUX || defined C50 || defined C52 || ( defined GCC && __GNUC__ >= 3 ) || ( defined WNT && _MSC_VER >= 1400 ) )
-/*N*/ lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
-/*N*/ #else
-/*N*/ lcl_IterGetNumberFormat( nNumFormat,
-/*N*/ (ScAttrArray const *&)pAttrArray,
-/*N*/ #endif
-/*N*/ nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
/*N*/ rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
/*N*/ }
/*N*/ nNumFmtType = NUMBERFORMAT_NUMBER;
@@ -558,9 +530,9 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, USHORT nTable,
/*N*/ const ScQueryParam& rParam, BOOL bMod ) :
+/*N*/ aParam (rParam),
/*N*/ pDoc( pDocument ),
/*N*/ nTab( nTable),
-/*N*/ aParam (rParam),
/*N*/ nStopOnMismatch( nStopOnMismatchDisabled ),
/*N*/ nTestEqualCondition( nTestEqualConditionDisabled ),
/*N*/ bAdvanceQuery( FALSE )
@@ -673,14 +645,6 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/
/*N*/ ULONG ScQueryCellIterator::GetNumberFormat()
/*N*/ {
-/*N*/ ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-/*N*/ #if ! ( defined WTC || defined ICC || defined HPUX || defined C50 || defined C52 || ( defined GCC && __GNUC__ >= 3 ) || ( defined WNT && _MSC_VER >= 1400 ) )
-/*N*/ lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
-/*N*/ #else
-/*N*/ lcl_IterGetNumberFormat( nNumFormat,
-/*N*/ (ScAttrArray const *&)pAttrArray,
-/*N*/ #endif
-/*N*/ nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
/*N*/ return nNumFormat;
/*N*/ }
@@ -742,6 +706,8 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/ case SC_GREATER_EQUAL :
/*N*/ rEntry.eOp = SC_EQUAL;
/*N*/ break;
+/*N*/ default :
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ else
@@ -885,10 +851,10 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
/*N*/ USHORT nCol2, USHORT nRow2) :
/*N*/ pDoc( pDocument ),
/*N*/ nTab( nTable ),
-/*N*/ nCol( nCol1 ),
/*N*/ nEndCol( nCol2 ),
/*N*/ nStartRow( nRow1 ),
-/*N*/ nEndRow( nRow2 )
+/*N*/ nEndRow( nRow2 ),
+/*N*/ nCol( nCol1 )
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pDoc->pTab[nTab] )
/*N*/ pColIter = pDoc->pTab[nTab]->aCol[nCol].CreateAttrIterator( nStartRow, nEndRow );
diff --git a/binfilter/bf_sc/source/core/data/sc_documen4.cxx b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
index 08a69c3..f51aef3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen4.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
@@ -301,6 +301,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pCondFormList->CompileAll(); // na
/*N*/ else
/*N*/ aData.bError = TRUE;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/
/*N*/ if (aData.bError)
@@ -309,10 +311,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pCondFormList->CompileAll(); // na
/*N*/ return !aData.bError;
/*N*/ }
-/*N*/ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat )
+/*N*/ double ScDocument::RoundValueAsShown( double , ULONG )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 short nType;
- return 0;//STRIP001 return fVal;
+DBG_BF_ASSERT(0, "STRIP");
+ return 0;
}
//
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index 44a950a..3554d97 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -127,19 +127,18 @@ using namespace ::com::sun::star;
/*N*/ ScDPObject::ScDPObject( ScDocument* pD ) :
/*N*/ pDoc( pD ),
-/*N*/ bAlive( FALSE ),
/*N*/ pSaveData( NULL ),
/*N*/ pSheetDesc( NULL ),
/*N*/ pImpDesc( NULL ),
/*N*/ pServDesc( NULL ),
/*N*/ pOutput( NULL ),
-/*N*/ bSettingsChanged( FALSE )
+/*N*/ bSettingsChanged( FALSE ),
+/*N*/ bAlive( FALSE )
/*N*/ {
/*N*/ }
/*N*/ ScDPObject::ScDPObject(const ScDPObject& r) :
/*N*/ pDoc( r.pDoc ),
-/*N*/ bAlive( FALSE ),
/*N*/ pSaveData( NULL ),
/*N*/ aTableName( r.aTableName ),
/*N*/ aTableTag( r.aTableTag ),
@@ -148,7 +147,8 @@ using namespace ::com::sun::star;
/*N*/ pImpDesc( NULL ),
/*N*/ pServDesc( NULL ),
/*N*/ pOutput( NULL ),
-/*N*/ bSettingsChanged( FALSE )
+/*N*/ bSettingsChanged( FALSE ),
+/*N*/ bAlive( FALSE )
/*N*/ {
/*N*/ if (r.pSaveData)
/*N*/ pSaveData = new ScDPSaveData(*r.pSaveData);
@@ -214,19 +214,19 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPObject(*this);
/*N*/ pSheetDesc->aQueryParam.nCol2 = pSheetDesc->aSourceRange.aEnd.Col();
/*N*/ pSheetDesc->aQueryParam.nRow2 = pSheetDesc->aSourceRange.aEnd.Row();;
/*N*/ pSheetDesc->aQueryParam.bHasHeader = TRUE;
-/*N*/ USHORT nCount = pSheetDesc->aQueryParam.GetEntryCount();
+/*N*/ /*USHORT nCount =*/ pSheetDesc->aQueryParam.GetEntryCount();
/*N*/
/*N*/ InvalidateSource(); // new source must be created
/*N*/ }
-/*N*/ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc)
+/*N*/ void ScDPObject::SetImportDesc(const ScImportSourceDesc&)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pImpDesc && rDesc == *pImpDesc )
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc)
+/*N*/ void ScDPObject::SetServiceData(const ScDPServiceDesc&)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -316,8 +316,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
-/*N*/ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
-/*N*/ const ScRange& rRange, short nDx, short nDy, short nDz )
+/*N*/ void ScDPObject::UpdateReference( UpdateRefMode /*eUpdateRefMode*/,
+/*N*/ const ScRange& /*rRange*/, short /*nDx*/, short /*nDy*/, short /*nDz*/ )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Output area
}
@@ -786,14 +786,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
/*N*/ PivotField* pFields, USHORT nCount, USHORT nOrient,
/*N*/ ScDocument* pDoc, USHORT nRow, USHORT nTab,
-/*N*/ const uno::Reference<sheet::XDimensionsSupplier>& xSource,
+/*N*/ const uno::Reference<sheet::XDimensionsSupplier>& /*xSource*/,
/*N*/ BOOL bOldDefaults,
/*N*/ PivotField* pRefColFields, USHORT nRefColCount,
/*N*/ PivotField* pRefRowFields, USHORT nRefRowCount )
/*N*/ {
-/*N*/ // pDoc or xSource must be set
-/*N*/ DBG_ASSERT( pDoc || xSource.is(), "missing string source" );
-/*N*/
/*N*/ String aDocStr;
/*N*/ ScDPSaveDimension* pDim;
/*N*/
@@ -808,7 +805,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ if ( pDoc )
/*N*/ pDoc->GetString( nCol, nRow, nTab, aDocStr );
/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ if ( aDocStr.Len() )
/*N*/ pDim = rSaveData.GetDimensionByName(aDocStr);
@@ -886,7 +883,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ }
}
-/*N*/ void ScDPObject::InitFromOldPivot( const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource )
+/*N*/ void ScDPObject::InitFromOldPivot( const ScPivot& rOld, ScDocument* pInDoc, BOOL bSetSource )
/*N*/ {
/*N*/ ScDPSaveData aSaveData;
/*N*/
@@ -896,13 +893,13 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ rOld.GetParam( aParam, aQuery, aArea );
/*N*/
/*N*/ ConvertOrientation( aSaveData, aParam.aColArr, aParam.nColCount,
-/*N*/ sheet::DataPilotFieldOrientation_COLUMN, pDoc, aArea.nRowStart, aArea.nTab,
+/*N*/ sheet::DataPilotFieldOrientation_COLUMN, pInDoc, aArea.nRowStart, aArea.nTab,
/*N*/ uno::Reference<sheet::XDimensionsSupplier>(), TRUE );
/*N*/ ConvertOrientation( aSaveData, aParam.aRowArr, aParam.nRowCount,
-/*N*/ sheet::DataPilotFieldOrientation_ROW, pDoc, aArea.nRowStart, aArea.nTab,
+/*N*/ sheet::DataPilotFieldOrientation_ROW, pInDoc, aArea.nRowStart, aArea.nTab,
/*N*/ uno::Reference<sheet::XDimensionsSupplier>(), TRUE );
/*N*/ ConvertOrientation( aSaveData, aParam.aDataArr, aParam.nDataCount,
-/*N*/ sheet::DataPilotFieldOrientation_DATA, pDoc, aArea.nRowStart, aArea.nTab,
+/*N*/ sheet::DataPilotFieldOrientation_DATA, pInDoc, aArea.nRowStart, aArea.nTab,
/*N*/ uno::Reference<sheet::XDimensionsSupplier>(), TRUE,
/*N*/ aParam.aColArr, aParam.nColCount, aParam.aRowArr, aParam.nRowCount );
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
index 5c9c923..e75680b 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
@@ -176,16 +176,16 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
/*N*/ aName( rName ),
+/*N*/ pLayoutName( NULL ),
/*N*/ bIsDataLayout( bDataLayout ),
/*N*/ bDupFlag( FALSE ),
/*N*/ nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
-/*N*/ bSubTotalDefault( TRUE ),
-/*N*/ nSubTotalCount( 0 ),
-/*N*/ pSubTotalFuncs( NULL ),
-/*N*/ nShowEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
/*N*/ nFunction( sheet::GeneralFunction_AUTO ),
/*N*/ nUsedHierarchy( -1 ),
-/*N*/ pLayoutName( NULL )
+/*N*/ nShowEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
+/*N*/ bSubTotalDefault( TRUE ),
+/*N*/ nSubTotalCount( 0 ),
+/*N*/ pSubTotalFuncs( NULL )
/*N*/ {
/*N*/ }
/*N*/
@@ -194,12 +194,12 @@ using namespace ::com::sun::star;
/*N*/ bIsDataLayout( r.bIsDataLayout ),
/*N*/ bDupFlag( r.bDupFlag ),
/*N*/ nOrientation( r.nOrientation ),
+/*N*/ nFunction( r.nFunction ),
+/*N*/ nUsedHierarchy( r.nUsedHierarchy ),
+/*N*/ nShowEmptyMode( r.nShowEmptyMode ),
/*N*/ bSubTotalDefault( r.bSubTotalDefault ),
/*N*/ nSubTotalCount( r.nSubTotalCount ),
-/*N*/ pSubTotalFuncs( NULL ),
-/*N*/ nShowEmptyMode( r.nShowEmptyMode ),
-/*N*/ nFunction( r.nFunction ),
-/*N*/ nUsedHierarchy( r.nUsedHierarchy )
+/*N*/ pSubTotalFuncs( NULL )
/*N*/ {
/*N*/ if ( nSubTotalCount && r.pSubTotalFuncs )
/*N*/ {
@@ -318,16 +318,15 @@ using namespace ::com::sun::star;
/*N*/ if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) ) // should not happen
/*N*/ return FALSE;
/*N*/
-/*N*/ long i;
-/*N*/ for (i=0; i<nSubTotalCount; i++)
+/*N*/ for (long i=0; i<nSubTotalCount; i++)
/*N*/ if ( pSubTotalFuncs[i] != r.pSubTotalFuncs[i] )
/*N*/ return FALSE;
/*N*/
-/*N*/ long nCount = aMemberList.Count();
+/*N*/ ULONG nCount = aMemberList.Count();
/*N*/ if ( nCount != r.aMemberList.Count() )
/*N*/ return FALSE;
/*N*/
-/*N*/ for (i=0; i<nCount; i++)
+/*N*/ for (ULONG i=0; i<nCount; i++)
/*N*/ if ( !( *(ScDPSaveMember*)aMemberList.GetObject(i) ==
/*N*/ *(ScDPSaveMember*)r.aMemberList.GetObject(i) ) )
/*N*/ return FALSE;
@@ -492,11 +491,11 @@ using namespace ::com::sun::star;
/*N*/ for (long i=0; i<nCount; i++)
/*N*/ {
/*N*/ ScDPSaveMember* pMember = (ScDPSaveMember*)aMemberList.GetObject(i);
-/*N*/ ::rtl::OUString aName = pMember->GetName();
-/*N*/ if ( xMembers->hasByName( aName ) )
+/*N*/ ::rtl::OUString aLclName = pMember->GetName();
+/*N*/ if ( xMembers->hasByName( aLclName ) )
/*N*/ {
/*N*/ uno::Reference<uno::XInterface> xMemberInt = ScUnoHelpFunctions::AnyToInterface(
-/*N*/ xMembers->getByName( aName ) );
+/*N*/ xMembers->getByName( aLclName ) );
/*N*/ pMember->WriteToSource( xMemberInt );
/*N*/ }
/*N*/ // missing member is no error
@@ -570,11 +569,11 @@ using namespace ::com::sun::star;
/*N*/ nRepeatEmptyMode != r.nRepeatEmptyMode )
/*N*/ return FALSE;
/*N*/
-/*N*/ long nCount = aDimList.Count();
+/*N*/ ULONG nCount = aDimList.Count();
/*N*/ if ( nCount != r.aDimList.Count() )
/*N*/ return FALSE;
/*N*/
-/*N*/ for (long i=0; i<nCount; i++)
+/*N*/ for (ULONG i=0; i<nCount; i++)
/*N*/ if ( !( *(ScDPSaveDimension*)aDimList.GetObject(i) ==
/*N*/ *(ScDPSaveDimension*)r.aDimList.GetObject(i) ) )
/*N*/ return FALSE;
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 52864e3..f2d1bda 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -124,10 +124,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ const TypedStrCollection& ScSheetDPData::GetColumnEntries(long nColumn)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
-/*N*/ }
-
/*N*/ String ScSheetDPData::getDimensionName(long nColumn)
/*N*/ {
/*N*/ if (getIsDataLayoutDimension(nColumn))
@@ -192,8 +188,8 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ UINT32 ScSheetDPData::GetNumberFormat(long nDim)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001
+/*N*/ UINT32 ScSheetDPData::GetNumberFormat(long)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
/*N*/ BOOL ScSheetDPData::getIsDataLayoutDimension(long nColumn)
@@ -213,8 +209,8 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScSheetDPData::GetNextRow( const ScDPTableIteratorParam& rParam )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001
+/*N*/ BOOL ScSheetDPData::GetNextRow( const ScDPTableIteratorParam& )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
// -----------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
index 20b0178..6246fd3 100644
--- a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
@@ -92,17 +92,17 @@ using namespace ::com::sun::star;
/*N*/ nRowDimCount( 0 ),
/*N*/ nDataDimCount( 0 ),
/*N*/ nPageDimCount( 0 ),
+/*N*/ bColumnGrand( TRUE ), // default is true
+/*N*/ bRowGrand( TRUE ),
+/*N*/ bIgnoreEmptyRows( FALSE ),
+/*N*/ bRepeatIfEmpty( FALSE ),
/*N*/ nDupCount( 0 ),
-/*N*/ bResultOverflow( FALSE ),
/*N*/ pResData( NULL ),
/*N*/ pColResRoot( NULL ),
/*N*/ pRowResRoot( NULL ),
/*N*/ pColResults( NULL ),
/*N*/ pRowResults( NULL ),
-/*N*/ bColumnGrand( TRUE ), // default is true
-/*N*/ bRowGrand( TRUE ),
-/*N*/ bIgnoreEmptyRows( FALSE ),
-/*N*/ bRepeatIfEmpty( FALSE )
+/*N*/ bResultOverflow( FALSE )
/*N*/ {
/*N*/ pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
/*N*/ }
@@ -287,20 +287,20 @@ using namespace ::com::sun::star;
/*?*/ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults()
/*?*/ throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< uno::Sequence<sheet::DataResult> >(0); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< uno::Sequence<sheet::DataResult> >(0);
/*?*/ }
/*?*/ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
-/*?*/ void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& l )
+/*?*/ void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& )
/*?*/ throw(uno::RuntimeException)
/*?*/ {
/*?*/ DBG_ERROR("not implemented"); //! exception?
/*?*/ }
-/*?*/ void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& l )
+/*?*/ void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& )
/*?*/ throw(uno::RuntimeException)
/*?*/ {
/*?*/ DBG_ERROR("not implemented"); //! exception?
@@ -857,7 +857,7 @@ using namespace ::com::sun::star;
/*N*/ return aRet;
/*N*/ }
-/*?*/ void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& rNewName ) throw(uno::RuntimeException)
+/*?*/ void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& ) throw(uno::RuntimeException)
/*?*/ {
/*?*/ DBG_ERROR("not implemented"); //! exception?
/*?*/ }
@@ -1061,7 +1061,7 @@ using namespace ::com::sun::star;
/*N*/ return pSource->GetData()->getDimensionName( nSrcDim ); // (original) dimension name
/*N*/ }
-/*?*/ void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& rNewName ) throw(uno::RuntimeException)
+/*?*/ void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& ) throw(uno::RuntimeException)
/*?*/ {
/*?*/ DBG_ERROR("not implemented"); //! exception?
/*?*/ }
@@ -1095,7 +1095,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ {MAP_CHAR_LEN(SC_UNO_SHOWEMPT), 0, &getBooleanCppuType(), 0, 0 },
/*N*/ {MAP_CHAR_LEN(SC_UNO_SUBTOTAL), 0, &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 },
-/*N*/ {0,0,0,0}
+/*N*/ {0,0,0,0,0,0}
/*N*/ };
/*N*/ static uno::Reference<beans::XPropertySetInfo> aRef =
/*N*/ new SfxItemPropertySetInfo( aDPLevelMap_Impl );
diff --git a/binfilter/bf_sc/source/core/data/sc_drawpage.cxx b/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
index 4777100..ebde99e 100644
--- a/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drawpage.cxx
@@ -42,8 +42,8 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPage) :
-/*N*/ FmFormPage(rNewModel, pBasic, bMasterPage)
+/*N*/ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pInBasic, BOOL bMasterPage) :
+/*N*/ FmFormPage(rNewModel, pInBasic, bMasterPage)
/*N*/ {
/*N*/ SetSize( Size( LONG_MAX, LONG_MAX ) );
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_markdata.cxx b/binfilter/bf_sc/source/core/data/sc_markdata.cxx
index 3792f8e..802dd20 100644
--- a/binfilter/bf_sc/source/core/data/sc_markdata.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_markdata.cxx
@@ -53,9 +53,9 @@ namespace binfilter {
/*N*/ }
/*N*/ ScMarkData::ScMarkData(const ScMarkData& rData) :
-/*N*/ pMultiSel( NULL ),
/*N*/ aMarkRange( rData.aMarkRange ),
-/*N*/ aMultiRange( rData.aMultiRange )
+/*N*/ aMultiRange( rData.aMultiRange ),
+/*N*/ pMultiSel( NULL )
/*N*/ {
/*N*/ bMarked = rData.bMarked;
/*N*/ bMultiMarked = rData.bMultiMarked;
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
index b771916..37e9131 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
@@ -189,10 +189,10 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ bDetectCat (rPivot.bDetectCat),
/*N*/ bMakeTotalCol (rPivot.bMakeTotalCol),
/*N*/ bMakeTotalRow (rPivot.bMakeTotalRow),
-/*N*/ nColNameCount (0),
-/*N*/ pColNames (NULL),
/*N*/ aName (rPivot.aName),
/*N*/ aTag (rPivot.aTag),
+/*N*/ nColNameCount (0),
+/*N*/ pColNames (NULL),
/*N*/ nSrcCol1 (rPivot.nSrcCol1),
/*N*/ nSrcRow1 (rPivot.nSrcRow1),
/*N*/ nSrcCol2 (rPivot.nSrcCol2),
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index 60dd644..422766d 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -72,9 +72,9 @@ namespace binfilter {
//========================================================================
-/*N*/ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPool,
+/*N*/ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rInPool,
/*N*/ ScDocument* pDocument )
-/*N*/ : SfxStyleSheetPool( rPool ),
+/*N*/ : SfxStyleSheetPool( rInPool ),
/*N*/ pActualStyleSheet( NULL ),
/*N*/ pDoc( pDocument ),
/*N*/ pForceStdName( NULL )
@@ -133,9 +133,9 @@ namespace binfilter {
/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create(
/*N*/ const String& rName,
/*N*/ SfxStyleFamily eFamily,
-/*N*/ USHORT nMask )
+/*N*/ USHORT nInMask )
/*N*/ {
-/*N*/ ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMask );
+/*N*/ ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nInMask );
/*N*/ if ( eFamily == SFX_STYLE_FAMILY_PARA && ScGlobal::GetRscString(STR_STYLENAME_STANDARD) != rName )
/*N*/ pSheet->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
/*N*/
@@ -144,9 +144,9 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
+/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
//------------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
index 8962bf4..538d3fd 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
@@ -60,11 +60,11 @@ namespace binfilter {
//========================================================================
/*N*/ ScStyleSheet::ScStyleSheet( const String& rName,
-/*N*/ ScStyleSheetPool& rPool,
+/*N*/ ScStyleSheetPool& rInPool,
/*N*/ SfxStyleFamily eFamily,
-/*N*/ USHORT nMask )
+/*N*/ USHORT nInMask )
/*N*/
-/*N*/ : SfxStyleSheet ( rName, rPool, eFamily, nMask )
+/*N*/ : SfxStyleSheet ( rName, rInPool, eFamily, nInMask )
/*N*/ , eUsage( UNKNOWN )
/*N*/ {
/*N*/ }
@@ -131,8 +131,8 @@ namespace binfilter {
/*N*/ // deshalb werden an dieser Stelle geeignete
/*N*/ // Werte eingestellt. (==Standard-Seitenvorlage)
/*N*/
-/*N*/ SfxItemPool& rPool = GetPool().GetPool();
-/*N*/ pSet = new SfxItemSet( rPool,
+/*N*/ SfxItemPool& rLclPool = GetPool().GetPool();
+/*N*/ pSet = new SfxItemSet( rLclPool,
/*N*/ ATTR_BACKGROUND, ATTR_BACKGROUND,
/*N*/ ATTR_BORDER, ATTR_SHADOW,
/*N*/ ATTR_LRSPACE, ATTR_PAGE_NULLVALS,
@@ -151,7 +151,7 @@ namespace binfilter {
/*N*/ // Setzen von sinnvollen Default-Werten:
/*N*/ //!!! const-Document wegcasten (im Ctor mal bei Gelegenheit aendern)
/*N*/ SfxPrinter* pPrinter = pDoc->GetPrinter();
-/*N*/ USHORT nBinCount = pPrinter->GetPaperBinCount();
+/*N*/ /*USHORT nBinCount =*/ pPrinter->GetPaperBinCount();
/*N*/ SvxPageItem aPageItem( ATTR_PAGE );
/*N*/ // #50536# PaperBin auf Default lassen,
/*N*/ // nicht auf aktuelle Drucker-Einstellung umsetzen
@@ -161,7 +161,7 @@ namespace binfilter {
/*N*/
/*N*/ SvxSetItem aHFSetItem(
/*N*/ (const SvxSetItem&)
-/*N*/ rPool.GetDefaultItem(ATTR_PAGE_HEADERSET) );
+/*N*/ rLclPool.GetDefaultItem(ATTR_PAGE_HEADERSET) );
/*N*/
/*N*/ SfxItemSet& rHFSet = aHFSetItem.GetItemSet();
/*N*/ SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand
@@ -206,12 +206,12 @@ namespace binfilter {
/*M*/ SvxFrameDirection eDirection = FRMDIR_HORI_LEFT_TOP;
/*M*/ pSet->Put( SvxFrameDirectionItem( eDirection ), ATTR_WRITINGDIR );
/*M*/
-/*N*/ rPool.SetPoolDefaultItem( aPageItem );
-/*N*/ rPool.SetPoolDefaultItem( aPaperSizeItem );
-/*N*/ rPool.SetPoolDefaultItem( aLRSpaceItem );
-/*N*/ rPool.SetPoolDefaultItem( aULSpaceItem );
-/*N*/ rPool.SetPoolDefaultItem( SfxUInt16Item( ATTR_PAGE_SCALE, 100 ) );
-/*N*/ rPool.SetPoolDefaultItem( SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 0 ) );
+/*N*/ rLclPool.SetPoolDefaultItem( aPageItem );
+/*N*/ rLclPool.SetPoolDefaultItem( aPaperSizeItem );
+/*N*/ rLclPool.SetPoolDefaultItem( aLRSpaceItem );
+/*N*/ rLclPool.SetPoolDefaultItem( aULSpaceItem );
+/*N*/ rLclPool.SetPoolDefaultItem( SfxUInt16Item( ATTR_PAGE_SCALE, 100 ) );
+/*N*/ rLclPool.SetPoolDefaultItem( SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 0 ) );
/*N*/ }
/*N*/ }
/*N*/ break;
@@ -250,7 +250,7 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ void ScStyleSheet::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+/*N*/ void ScStyleSheet::SFX_NOTIFY( SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
/*N*/ const SfxHint& rHint, const TypeId& rHintType )
/*N*/ {
/*N*/ if ( rHint.ISA(SfxSimpleHint) )
diff --git a/binfilter/bf_sc/source/core/data/sc_table3.cxx b/binfilter/bf_sc/source/core/data/sc_table3.cxx
index f04f7fa..2357715 100644
--- a/binfilter/bf_sc/source/core/data/sc_table3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table3.cxx
@@ -200,6 +200,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() )
/*?*/ case SC_NOT_EQUAL :
/*?*/ bOk = !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
/*?*/ break;
+/*?*/ default :
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/ else if ( (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
@@ -281,6 +283,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() )
/*?*/ if ( bOk && pbTestEqualCondition && !bTestEqual )
/*?*/ bTestEqual = (nCompare == 0);
/*?*/ break;
+/*?*/ default :
+/*?*/ break;
/*?*/ }
/*N*/ }
/*N*/ }
@@ -330,10 +334,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() )
-/*N*/ BOOL ScTable::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, ScQueryParam& rQueryParam)
+/*N*/ BOOL ScTable::CreateQueryParam(USHORT, USHORT, USHORT, USHORT, ScQueryParam&)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT i, nCount;
-return FALSE;//STRIP001 return bValid;
+DBG_BF_ASSERT(0, "STRIP");
+return FALSE;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_table5.cxx b/binfilter/bf_sc/source/core/data/sc_table5.cxx
index a445231..a5e189c 100644
--- a/binfilter/bf_sc/source/core/data/sc_table5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table5.cxx
@@ -321,6 +321,8 @@ namespace binfilter {
/*?*/ case CELLTYPE_FORMULA :
/*?*/ ((ScFormulaCell*)pCell)->SetDirty();
/*?*/ break;
+/*?*/ default :
+/*?*/ break;
/*?*/ }
/*?*/ }
/*?*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_userdat.cxx b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
index 8143ed2..baeab9e 100644
--- a/binfilter/bf_sc/source/core/data/sc_userdat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_userdat.cxx
@@ -636,7 +636,7 @@ namespace binfilter {
/*N*/ ScDrawObjData::~ScDrawObjData()
/*N*/ {}
/*N*/
-/*N*/ SdrObjUserData* ScDrawObjData::Clone(SdrObject* pObj) const
+/*N*/ SdrObjUserData* ScDrawObjData::Clone(SdrObject* /*pObj*/) const
/*N*/ {
/*N*/ return new ScDrawObjData( *this );
/*N*/ }
@@ -689,7 +689,7 @@ namespace binfilter {
/*N*/ {
/*N*/ }
/*N*/
-/*N*/ SdrObjUserData* ScIMapInfo::Clone( SdrObject* pObj ) const
+/*N*/ SdrObjUserData* ScIMapInfo::Clone( SdrObject* /*pObj*/ ) const
/*N*/ {
/*N*/ return new ScIMapInfo( *this );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index c6d704a..5f728fa 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -839,7 +839,7 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/ }
-/*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, pTimer )
+/*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, EMPTYARG )
/*N*/ {
/*N*/ SwFEShell* pSh = (SwFEShell*)GetEditShell();
/*N*/ if( pSh )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 7c7e2ed..75482d9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -439,7 +439,7 @@ void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM)
* --------------------------------------------------*/
void lcl_SetNodeNumStart( SwPaM& rCrsr, uno::Any aValue )
{
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
aValue >>= nTmp;
sal_uInt16 nStt = (nTmp < 0 ? USHRT_MAX : (sal_uInt16)nTmp);
SwDoc* pDoc = rCrsr.GetDoc();
@@ -468,7 +468,7 @@ class SwTextCursorItemSet_Impl
public:
SwTextCursorItemSet_Impl( SwDoc *pD, sal_uInt16 nW ) :
- pDoc( pD ), nWhich( nW ), pItemSet(0), bGotAttrs( sal_False ) {}
+ pDoc( pD ), pItemSet(0), nWhich( nW ), bGotAttrs( sal_False ) {}
~SwTextCursorItemSet_Impl()
{delete pItemSet;}
@@ -541,7 +541,7 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap,
{
if( FN_UNO_NUM_LEVEL == pMap->nWID)
{
- sal_Int16 nLevel;
+ sal_Int16 nLevel(0);
aValue >>= nLevel;
sal_Int16 nOldLevel = pTxtNd->GetNum()->GetLevel() & ~NO_NUMLEVEL;
if(nLevel < MAXLEVEL && nOldLevel != nLevel)
@@ -800,8 +800,8 @@ Sequence< OUString > SwXTextCursor::getSupportedServiceNames(void) throw( Runtim
SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, const SwPosition& rPos,
CursorType eSet, SwDoc* pDoc, const SwPosition* pMark) :
aLstnrCntnr(( util::XSortable*)this),
- xParentText(xParent),
aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
+ xParentText(xParent),
pLastSortOptions(0),
eType(eSet)
{
@@ -819,8 +819,8 @@ SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, const SwPosition&
SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent,
SwUnoCrsr* pSourceCrsr, CursorType eSet) :
aLstnrCntnr( (util::XSortable*)this),
- xParentText(xParent),
aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)),
+ xParentText(xParent),
pLastSortOptions(0),
eType(eSet)
{
@@ -1102,8 +1102,7 @@ void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_B
case CURSOR_FOOTNOTE: eSearchNodeType = SwFootnoteStartNode; break;
case CURSOR_HEADER: eSearchNodeType = SwHeaderStartNode; break;
case CURSOR_FOOTER: eSearchNodeType = SwFooterStartNode; break;
- //case CURSOR_INVALID:
- //case CURSOR_BODY:
+ default: break;
}
const SwStartNode* pOwnStartNode = pOwnCursor->GetNode()->
FindSttNodeByType(eSearchNodeType);
@@ -1151,9 +1150,9 @@ void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_B
SwPosition* pParamRight;
if(pCursor)
{
- const SwPaM* pTmp = pCursor->GetPaM();
- pParamLeft = new SwPosition(*pTmp->GetPoint());
- pParamRight = new SwPosition(pTmp->HasMark() ? *pTmp->GetMark() : *pParamLeft);
+ const SwPaM* pLclTmp = pCursor->GetPaM();
+ pParamLeft = new SwPosition(*pLclTmp->GetPoint());
+ pParamRight = new SwPosition(pLclTmp->HasMark() ? *pLclTmp->GetMark() : *pParamLeft);
}
else
{
@@ -1163,9 +1162,9 @@ void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_B
}
if(*pParamRight < *pParamLeft)
{
- SwPosition* pTmp = pParamLeft;
+ SwPosition* pLclTmp = pParamLeft;
pParamLeft = pParamRight;
- pParamRight = pTmp;
+ pParamRight = pLclTmp;
}
// jetzt sind vier SwPositions da, zwei davon werden gebraucht, also welche?
if(aOwnRight < *pParamRight)
@@ -1185,12 +1184,12 @@ void SwXTextCursor::gotoRange(const uno::Reference< XTextRange > & xRange, sal_B
//der Cursor soll dem uebergebenen Range entsprechen
if(pCursor)
{
- const SwPaM* pTmp = pCursor->GetPaM();
- *pOwnCursor->GetPoint() = *pTmp->GetPoint();
- if(pTmp->HasMark())
+ const SwPaM* pLclTmp = pCursor->GetPaM();
+ *pOwnCursor->GetPoint() = *pLclTmp->GetPoint();
+ if(pLclTmp->HasMark())
{
pOwnCursor->SetMark();
- *pOwnCursor->GetMark() = *pTmp->GetMark();
+ *pOwnCursor->GetMark() = *pLclTmp->GetMark();
}
else
pOwnCursor->DeleteMark();
@@ -1938,7 +1937,7 @@ uno::Reference< beans::XPropertySetInfo > SwXTextCursor::getPropertySetInfo(voi
{
{ SW_PROP_NAME(UNO_NAME_IS_SKIP_HIDDEN_TEXT), FN_SKIP_HIDDEN_TEXT, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_IS_SKIP_PROTECTED_TEXT), FN_SKIP_PROTECTED_TEXT, &::getBooleanCppuType(), PROPERTY_NONE, 0},
- {0,0,0,0}
+ {0,0,0,0,0,0}
};
uno::Reference< beans::XPropertySetInfo > xInfo = aPropSet.getPropertySetInfo();
// PropertySetInfo verlaengern!
diff --git a/binfilter/inc/bf_sc/dpshttab.hxx b/binfilter/inc/bf_sc/dpshttab.hxx
index f97ed1e..ab00ef3 100644
--- a/binfilter/inc/bf_sc/dpshttab.hxx
+++ b/binfilter/inc/bf_sc/dpshttab.hxx
@@ -63,7 +63,6 @@ public:
virtual ~ScSheetDPData();
virtual long GetColumnCount();
- virtual const TypedStrCollection& GetColumnEntries(long nColumn);
virtual String getDimensionName(long nColumn);
virtual BOOL getIsDataLayoutDimension(long nColumn);
virtual BOOL IsDateDimension(long nDim);
diff --git a/binfilter/inc/bf_sc/dptabdat.hxx b/binfilter/inc/bf_sc/dptabdat.hxx
index d27192b..a6fffa5 100644
--- a/binfilter/inc/bf_sc/dptabdat.hxx
+++ b/binfilter/inc/bf_sc/dptabdat.hxx
@@ -120,7 +120,6 @@ public:
//! or separate Str and ValueCollection
virtual long GetColumnCount() = 0;
- virtual const TypedStrCollection& GetColumnEntries(long nColumn) = 0;
virtual String getDimensionName(long nColumn) = 0;
virtual BOOL getIsDataLayoutDimension(long nColumn) = 0;
virtual BOOL IsDateDimension(long nDim) = 0;
diff --git a/binfilter/inc/bf_sc/dptabres.hxx b/binfilter/inc/bf_sc/dptabres.hxx
index 883c42e..ba85618 100644
--- a/binfilter/inc/bf_sc/dptabres.hxx
+++ b/binfilter/inc/bf_sc/dptabres.hxx
@@ -79,13 +79,8 @@ struct ScDPItemData;
class ScDPResultData
{
public:
- ScDPResultData( ScDPSource* pSrc ) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScDPResultData( ScDPSource* pSrc ); //! Ref
- ~ScDPResultData(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ~ScDPResultData();
-
-
-
-
-
+ ScDPResultData( ScDPSource* /*pSrc*/ ) {DBG_BF_ASSERT(0, "STRIP");}
+ ~ScDPResultData(){DBG_BF_ASSERT(0, "STRIP");}
};
@@ -93,10 +88,10 @@ class ScDPResultMember
{
public:
- ScDPResultMember( ScDPResultData* pData, ScDPDimension* pDim,
- ScDPLevel* pLev, ScDPMember* pDesc,
- BOOL bForceSub ) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 BOOL bForceSub ); //! Ref
- ~ScDPResultMember(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ~ScDPResultMember();
+ ScDPResultMember( ScDPResultData*, ScDPDimension*,
+ ScDPLevel*, ScDPMember*,
+ BOOL ) {DBG_BF_ASSERT(0, "STRIP");}
+ ~ScDPResultMember(){DBG_BF_ASSERT(0, "STRIP");}
diff --git a/binfilter/inc/bf_sw/edimp.hxx b/binfilter/inc/bf_sw/edimp.hxx
index e6ecdca..d7f2f8c 100644
--- a/binfilter/inc/bf_sw/edimp.hxx
+++ b/binfilter/inc/bf_sw/edimp.hxx
@@ -75,9 +75,9 @@ SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 )
class SwPamRanges : private _SwPamRanges
{
public:
- SwPamRanges( const SwPaM& rRing ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SwPamRanges( const SwPaM& rRing );
+ SwPamRanges( const SwPaM& /*rRing*/ ){DBG_BF_ASSERT(0, "STRIP");}
- SwPaM& SetPam( USHORT nArrPos, SwPaM& rPam ){DBG_BF_ASSERT(0, "STRIP"); return rPam;} //STRIP001 SwPaM& SetPam( USHORT nArrPos, SwPaM& rPam );
+ SwPaM& SetPam( USHORT /*nArrPos*/, SwPaM& rPam ){DBG_BF_ASSERT(0, "STRIP"); return rPam;}
USHORT Count() const
{ return _SwPamRanges::Count(); }
More information about the Libreoffice-commits
mailing list