[Libreoffice-commits] .: 6 commits - binfilter/bf_sc binfilter/bf_xmloff binfilter/inc lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 3 07:18:24 PST 2011
binfilter/bf_sc/source/core/data/makefile.mk | 2
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 8
binfilter/bf_sc/source/core/data/sc_attrib.cxx | 38 +-
binfilter/bf_sc/source/core/data/sc_column3.cxx | 31 -
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 99 ++---
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 29 -
binfilter/bf_sc/source/core/data/sc_documen5.cxx | 6
binfilter/bf_sc/source/core/data/sc_documen7.cxx | 5
binfilter/bf_sc/source/core/data/sc_documen8.cxx | 25 -
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 14
binfilter/bf_sc/source/core/data/sc_document.cxx | 184 +++-------
binfilter/bf_sc/source/core/data/sc_global2.cxx | 66 ++-
binfilter/bf_sc/source/core/data/sc_markarr.cxx | 2
binfilter/bf_sc/source/core/data/sc_patattr.cxx | 12
binfilter/bf_sc/source/core/data/sc_table1.cxx | 64 +--
binfilter/bf_sc/source/core/data/sc_table2.cxx | 32 -
binfilter/bf_sc/source/core/src/makefile.mk | 1
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx | 2
binfilter/bf_sc/util/makefile.mk | 1
binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx | 8
binfilter/inc/bf_sc/global.hxx | 55 ++
binfilter/inc/bf_sfx2/bitset.hxx | 8
lotuswordpro/source/filter/lwpfrib.hxx | 2
23 files changed, 341 insertions(+), 353 deletions(-)
New commits:
commit 6adff51a8b11c80c1bb563b38a31771808c9a3d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 3 15:15:39 2011 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
index e8410ae..a9622fa 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
@@ -786,6 +786,8 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc)
pAction = CreateRejectionAction(static_cast<ScMyRejAction*>(*aItr));
}
break;
+ default:
+ break;
}
if (pAction)
diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
index ef96a28..6e84605 100644
--- a/binfilter/bf_sc/util/makefile.mk
+++ b/binfilter/bf_sc/util/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..
BFPRJ=..
diff --git a/binfilter/inc/bf_sc/global.hxx b/binfilter/inc/bf_sc/global.hxx
index 55cdfa3..5cec727 100644
--- a/binfilter/inc/bf_sc/global.hxx
+++ b/binfilter/inc/bf_sc/global.hxx
@@ -120,30 +120,55 @@ struct LabelData;
// Oberhalb dieser Grenze liegen
// die Indizes fuer DBBereiche
-#define VALIDROW(nRow) (nRow>=0 && nRow<=MAXROW)
-#define VALIDCOL(nCol) (nCol>=0 && nCol<=MAXCOL)
-#define VALIDTAB(nTab) (nTab>=0 && nTab<=MAXTAB)
-#define VALIDCOLROW(nCol,nRow) (VALIDCOL(nCol) && VALIDROW(nRow))
-#define VALIDCOLROWTAB(nCol,nRow,nTab) (VALIDCOL(nCol) && VALIDROW(nRow) && VALIDTAB(nTab))
+inline bool ValidRow(short nRow)
+{
+ return (nRow>=0 && nRow<=MAXROW);
+}
+
+inline bool ValidRow(USHORT nRow)
+{
+ return (nRow<=MAXROW);
+}
+
+#define VALIDROW(nRow) (ValidRow(nRow))
+
+inline bool ValidCol(short nCol)
+{
+ return (nCol>=0 && nCol<=MAXCOL);
+}
+
+inline bool ValidCOL(USHORT nCol)
+{
+ return (nCol<=MAXCOL);
+}
+
+#define VALIDCOL(nCol) (ValidCol(nCol))
-inline BOOL ValidColRow(USHORT nCol, USHORT nRow)
+inline bool ValidTab(short nTab)
+{
+ return (nTab>=0 && nTab<=MAXTAB);
+}
+
+inline bool ValidTab(USHORT nTab)
+{
+ return (nTab<=MAXTAB);
+}
+
+#define VALIDTAB(nTab) (ValidTab(nTab))
+
+#define VALIDCOLROW(nCol,nRow) (VALIDCOL(nCol) && VALIDROW(nRow))
+#define VALIDCOLROWTAB(nCol,nRow,nTab) (VALIDCOL(nCol) && VALIDROW(nRow) && VALIDTAB(nTab))
+
+inline bool ValidColRow(USHORT nCol, USHORT nRow)
{
return nCol <= MAXCOL && nRow <= MAXROW;
}
-inline BOOL ValidColRowTab(USHORT nCol, USHORT nRow, USHORT nTab)
+inline bool ValidColRowTab(USHORT nCol, USHORT nRow, USHORT nTab)
{
return nCol <= MAXCOL && nRow <= MAXROW && nTab <= MAXTAB;
}
-/*
-#ifdef OS2
-#define PIXEL_PER_INCH 72.0
-#else
-#define PIXEL_PER_INCH 96.0
-#endif
-*/
-
#define PIXEL_PER_INCH 96.0
#define CM_PER_INCH 2.54
commit b1ed0bde62e05989dd8b1e11f9188b08397c1637
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 3 15:11:50 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sc/source/core/data/makefile.mk b/binfilter/bf_sc/source/core/data/makefile.mk
index 5f1abbc..3ec4133 100644
--- a/binfilter/bf_sc/source/core/data/makefile.mk
+++ b/binfilter/bf_sc/source/core/data/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
index 2044123..c0c835e 100644
--- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx
@@ -284,7 +284,7 @@ namespace binfilter {
/*N*/ void ScAttrArray::SetPatternArea(USHORT nStartRow, USHORT nEndRow, const ScPatternAttr *pPattern, BOOL bPutToPool )
/*N*/ {
-/*N*/ if (nStartRow >= 0 && nStartRow <= MAXROW && nEndRow >= 0 && nEndRow <= MAXROW)
+/*N*/ if (nStartRow <= MAXROW && nEndRow <= MAXROW)
/*N*/ {
/*N*/ if (bPutToPool)
/*N*/ pPattern = (const ScPatternAttr*) &pDocument->GetPool()->Put(*pPattern);
@@ -466,7 +466,7 @@ namespace binfilter {
/*N*/ void ScAttrArray::ApplyStyleArea( USHORT nStartRow, USHORT nEndRow, ScStyleSheet* pStyle )
/*N*/ {
-/*N*/ if (nStartRow >= 0 && nStartRow <= MAXROW && nEndRow >= 0 && nEndRow <= MAXROW)
+/*N*/ if (nStartRow <= MAXROW && nEndRow <= MAXROW)
/*N*/ {
/*N*/ short nPos;
/*N*/ USHORT nStart=0;
@@ -552,7 +552,7 @@ namespace binfilter {
/*N*/ TestData();
/*N*/ #endif
/*N*/
-/*N*/ if (nStartRow >= 0 && nStartRow <= MAXROW && nEndRow >= 0 && nEndRow <= MAXROW)
+/*N*/ if (nStartRow <= MAXROW && nEndRow <= MAXROW)
/*N*/ {
/*N*/ short nPos;
/*N*/ USHORT nStart=0;
@@ -678,7 +678,7 @@ namespace binfilter {
/*N*/ void ScAttrArray::MergePatternArea( USHORT nStartRow, USHORT nEndRow,
/*N*/ SfxItemSet** ppSet, BOOL bDeep ) const
/*N*/ {
-/*N*/ if (nStartRow >= 0 && nStartRow <= MAXROW && nEndRow >= 0 && nEndRow <= MAXROW)
+/*N*/ if (nStartRow <= MAXROW && nEndRow <= MAXROW)
/*N*/ {
/*N*/ const ScPatternAttr* pOld1 = NULL;
/*N*/ const ScPatternAttr* pOld2 = NULL;
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index db60d41..8ebd300 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -130,7 +130,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT nVer ) const
+/*N*/ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ INT16 nCol;
/*N*/ INT16 nRow;
@@ -141,7 +141,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SvStream& ScMergeAttr::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScMergeAttr::Store( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ rStream << nColMerge;
/*N*/ rStream << nRowMerge;
@@ -305,7 +305,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, USHORT n ) const
+/*N*/ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, USHORT /*n*/ ) const
/*N*/ {
/*N*/ BOOL bProtect;
/*N*/ BOOL bHFormula;
@@ -322,7 +322,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SvStream& ScProtectionAttr::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScProtectionAttr::Store( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ rStream << bProtection;
/*N*/ rStream << bHideFormula;
@@ -373,14 +373,14 @@ using namespace ::com::sun::star;
//-----------------------------------------------------------------------
-/*N*/ USHORT ScRangeItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScRangeItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return 2;
/*N*/ }
//-----------------------------------------------------------------------
-/*N*/ SvStream& ScRangeItem::Store( SvStream& rStrm, USHORT nVer ) const
+/*N*/ SvStream& ScRangeItem::Store( SvStream& rStrm, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ rStrm << aRange;
/*N*/ rStrm << nFlags;
@@ -523,7 +523,7 @@ using namespace ::com::sun::star;
//-----------------------------------------------------------------------
-/*N*/ SvStream& ScTableListItem::Store( SvStream& rStrm, USHORT nVer ) const
+/*N*/ SvStream& ScTableListItem::Store( SvStream& rStrm, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ rStrm << nCount;
/*N*/
@@ -558,7 +558,7 @@ using namespace ::com::sun::star;
/*N*/ pNewItem = new ScTableListItem( Which(), aList );
/*N*/
/*N*/ aList.First();
-/*N*/ while ( p = (USHORT*)aList.Remove() )
+/*N*/ while (( p = (USHORT*)aList.Remove() ))
/*N*/ delete p;
/*N*/
/*N*/ return pNewItem;
@@ -626,7 +626,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ bool ScPageHFItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool ScPageHFItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ uno::Reference<sheet::XHeaderFooterContent> xContent =
/*N*/ new ScHeaderFooterContentObj( pLeftArea, pCenterArea, pRightArea );
@@ -635,7 +635,7 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ bool ScPageHFItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ bool bRet = false;
/*N*/ uno::Reference<sheet::XHeaderFooterContent> xContent;
@@ -713,7 +713,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ USHORT ScPageHFItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScPageHFItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ // 0 = ohne Feldbefehle
/*N*/ // 1 = Titel bzw. Dateiname mit SvxFileField
@@ -885,9 +885,9 @@ using namespace ::com::sun::star;
/*N*/ BOOL ConvertFields();
/*N*/ };
/*N*/
-/*N*/ ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pEnginePool,
-/*N*/ BOOL bDeleteEnginePool ) :
-/*N*/ ScEditEngineDefaulter( pEnginePool, bDeleteEnginePool ),
+/*N*/ ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pInEnginePool,
+/*N*/ BOOL bInDeleteEnginePool ) :
+/*N*/ ScEditEngineDefaulter( pInEnginePool, bInDeleteEnginePool ),
/*N*/ aExtFileId( TYPE( SvxExtFileField ) ),
/*N*/ nConvPara( 0 ),
/*N*/ nConvPos( 0 ),
@@ -896,7 +896,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/
/*N*/ String ScFieldChangerEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-/*N*/ USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor )
+/*N*/ USHORT nPara, USHORT nPos, Color*& /*rTxtColor*/, Color*& /*rFldColor*/ )
/*N*/ {
/*N*/ const SvxFieldData* pFieldData = rField.GetField();
/*N*/ if ( pFieldData && pFieldData->Type() == aExtFileId )
@@ -939,7 +939,7 @@ using namespace ::com::sun::star;
/*N*/ pArea->Store( rStream );
/*N*/ }
-/*N*/ SvStream& ScPageHFItem::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScPageHFItem::Store( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ if ( pLeftArea && pCenterArea && pRightArea )
/*N*/ {
@@ -1077,7 +1077,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ USHORT ScViewObjectModeItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT ScViewObjectModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -1145,7 +1145,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, USHORT nVer ) const
+/*N*/ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ double nTmp=0;
/*N*/ rStream >> nTmp;
@@ -1157,7 +1157,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ SvStream& ScDoubleItem::Store( SvStream& rStream, USHORT nVer ) const
+/*N*/ SvStream& ScDoubleItem::Store( SvStream& rStream, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ rStream << nValue;
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_column3.cxx b/binfilter/bf_sc/source/core/data/sc_column3.cxx
index f84eba8..66b17ea 100644
--- a/binfilter/bf_sc/source/core/data/sc_column3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column3.cxx
@@ -321,12 +321,11 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*N*/ ScBaseCell** ppDelCells = new ScBaseCell*[nEndIndex-nStartIndex+1];
/*N*/
/*N*/ BOOL bSimple = ((nDelFlag & IDF_CONTENTS) == IDF_CONTENTS);
-/*N*/ USHORT i;
/*N*/
/*N*/ // Notiz-Zeichenobjekte
/*N*/ if (nDelFlag & IDF_NOTE)
/*N*/ {
-/*N*/ for ( i = nStartIndex; i <= nEndIndex; i++ )
+/*N*/ for (USHORT i = nStartIndex; i <= nEndIndex; i++ )
/*N*/ {
/*N*/ const ScPostIt* pNote = pItems[i].pCell->GetNotePtr();
/*N*/ if ( pNote && pNote->IsShown() )
@@ -339,7 +338,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*N*/ // Broadcaster stehenlassen
/*N*/ if (bSimple)
/*N*/ {
-/*N*/ for (i = nStartIndex; i <= nEndIndex && bSimple; i++)
+/*N*/ for (USHORT i = nStartIndex; i <= nEndIndex && bSimple; i++)
/*N*/ if (pItems[i].pCell->GetBroadcaster())
/*N*/ bSimple = FALSE;
/*N*/ }
@@ -350,7 +349,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*N*/ {
/*N*/ ScBaseCell* pOldCell;
/*N*/ ScNoteCell* pNoteCell = new ScNoteCell; // Dummy
-/*N*/ for (i = nStartIndex; i <= nEndIndex; i++)
+/*N*/ for (USHORT i = nStartIndex; i <= nEndIndex; i++)
/*N*/ {
/*N*/ pOldCell = pItems[i].pCell;
/*N*/ if (pOldCell->GetCellType() == CELLTYPE_FORMULA) // Formeln spaeter loeschen
@@ -399,6 +398,8 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*?*/ bDelete = ((nDelFlag & IDF_NOTE) != 0) &&
/*?*/ (pOldCell->GetBroadcaster() == NULL);
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/
/*N*/ if (bDelete)
@@ -463,20 +464,20 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*N*/ // erst Listener abhaengen kann Neuberechnungen sparen
/*N*/ // eventuell werden dabei vorher entstandene NoteCell mitsamt
/*N*/ // ihren Broadcaster deleted!
-/*N*/ for (i=0; i<nDelCount; i++)
+/*N*/ for (USHORT i=0; i<nDelCount; i++)
/*N*/ {
/*?*/ ((ScFormulaCell*) ppDelCells[i])->EndListeningTo( pDocument );
/*N*/ }
/*N*/ // gibts die NoteCell und damit den Broadcaster noch?
/*N*/ // If not, discard them all before broadcasting takes place!
-/*N*/ for (i=0; i<nDelCount; i++)
+/*N*/ for (USHORT i=0; i<nDelCount; i++)
/*N*/ {
/*?*/ ScFormulaCell* pOldCell = (ScFormulaCell*) ppDelCells[i];
/*?*/ USHORT nIndex;
/*?*/ if ( !Search( pOldCell->aPos.Row(), nIndex ) )
/*?*/ pOldCell->ForgetBroadcaster();
/*N*/ }
-/*N*/ for (i=0; i<nDelCount; i++)
+/*N*/ for (USHORT i=0; i<nDelCount; i++)
/*N*/ {
/*?*/ ScFormulaCell* pOldCell = (ScFormulaCell*) ppDelCells[i];
/*?*/ aHint.SetAddress( pOldCell->aPos );
@@ -505,8 +506,8 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
/*N*/ else
/*N*/ {
/*?*/ BOOL bFound=FALSE;
-/*?*/ USHORT nStartIndex;
-/*?*/ USHORT nEndIndex;
+/*?*/ USHORT nStartIndex(0);
+/*?*/ USHORT nEndIndex(0);
/*?*/ for (USHORT i = 0; i < nCount; i++)
/*?*/ if ((pItems[i].nRow >= nStartRow) && (pItems[i].nRow <= nEndRow))
/*?*/ {
@@ -545,7 +546,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RemoveEditAttribs( nStartRow, nEnd
// Notizen muessen aber evtl. noch geloescht werden
/*N*/ ScBaseCell* ScColumn::CloneCell(USHORT nIndex, USHORT nFlags,
-/*N*/ ScDocument* pDestDoc, const ScAddress& rDestPos)
+/*N*/ ScDocument* pDestDoc, const ScAddress& /*rDestPos*/)
/*N*/ {
/*N*/ ScBaseCell* pNew = 0;
/*N*/ ScBaseCell* pSource = pItems[nIndex].pCell;
@@ -646,6 +647,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new
/*?*/ }
/*?*/ }
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/
/*N*/ if ( !pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
@@ -714,7 +717,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new
// TRUE = Zahlformat gesetzt
-/*N*/ BOOL ScColumn::SetString( USHORT nRow, USHORT nTab, const String& rString )
+/*N*/ BOOL ScColumn::SetString( USHORT nRow, USHORT nInTab, const String& rString )
/*N*/ {
/*N*/ BOOL bNumFmtSet = FALSE;
/*N*/ if (VALIDROW(nRow))
@@ -724,7 +727,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new
/*N*/ if (rString.Len() > 0)
/*N*/ {
/*N*/ double nVal;
-/*N*/ sal_uInt32 nIndex, nOldIndex;
+/*N*/ sal_uInt32 nIndex(0), nOldIndex(0);
/*N*/ sal_Unicode cFirstChar;
/*N*/ SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
/*N*/ SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
@@ -751,7 +754,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new
/*?*/ pNewCell = new ScStringCell( rString );
/*?*/ else // =Formel
/*?*/ pNewCell = new ScFormulaCell( pDocument,
-/*?*/ ScAddress( nCol, nRow, nTab ), rString, 0 );
+/*?*/ ScAddress( nCol, nRow, nInTab ), rString, 0 );
/*N*/ }
/*N*/ else if ( cFirstChar == '\'') // 'Text
/*?*/ pNewCell = new ScStringCell( rString.Copy(1) );
@@ -850,7 +853,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new
/*?*/ }
/*?*/ else
/*?*/ pDocument->Broadcast( ScHint( SC_HINT_DATACHANGED,
-/*?*/ ScAddress( nCol, nRow, nTab ), pNewCell ) );
+/*?*/ ScAddress( nCol, nRow, nInTab ), pNewCell ) );
/*?*/ }
/*?*/ else
/*?*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 1af7df2..bf6f233 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -256,77 +256,76 @@ namespace binfilter {
/*N*/ ScDocument::ScDocument( ScDocumentMode eMode,
/*N*/ SfxObjectShell* pDocShell ) :
/*N*/ xServiceManager( ::legacy_binfilters::getLegacyProcessServiceFactory() ),
-/*N*/ pDrawLayer( NULL ),
-/*N*/ pColorTable( NULL ),
+/*N*/ pEditEngine( NULL ),
/*N*/ pShell( pDocShell ),
/*N*/ pPrinter( NULL ),
-/*N*/ bAutoCalc( eMode == SCDOCMODE_DOCUMENT ),
-/*N*/ bAutoCalcShellDisabled( FALSE ),
-/*N*/ bForcedFormulaPending( FALSE ),
-/*N*/ bCalculatingFormulaTree( FALSE ),
-/*N*/ bIsUndo( eMode == SCDOCMODE_UNDO ),
-/*N*/ bIsClip( eMode == SCDOCMODE_CLIP ),
-/*N*/ bCutMode( FALSE ),
-/*N*/ nMaxTableNumber( 0 ),
+/*N*/ pDrawLayer( NULL ),
+/*N*/ pColorTable( NULL ),
/*N*/ pCondFormList( NULL ),
/*N*/ pValidationList( NULL ),
/*N*/ pFormatExchangeList( NULL ),
-/*N*/ bIsEmbedded( FALSE ),
-/*N*/ bProtected( FALSE ),
+/*N*/ pDPCollection( NULL ),
/*N*/ pLinkManager( NULL ),
-/*N*/ pDocOptions( NULL ),
-/*N*/ pViewOptions( NULL ),
-/*N*/ pExtDocOptions( NULL ),
-/*N*/ pConsolidateDlgData( NULL ),
/*N*/ pFormulaTree( NULL ),
/*N*/ pEOFormulaTree( NULL ),
-/*N*/ aCurTextWidthCalcPos(MAXCOL,0,0),
-/*N*/ // bNoSetDirty( TRUE ),
-/*N*/ bNoSetDirty( FALSE ),
/*N*/ pFormulaTrack( NULL ),
/*N*/ pEOFormulaTrack( NULL ),
+/*N*/ pOtherObjects( NULL ),
+/*N*/ pClipData( NULL ),
+/*N*/ pDetOpList(NULL),
+/*N*/ pChangeTrack( NULL ),
+/*N*/ pUnoBroadcaster( NULL ),
+/*N*/ pChangeViewSettings( NULL ),
+/*N*/ pScriptTypeData( NULL ),
+/*N*/ pCacheFieldEditEngine( NULL ),
+/*N*/ pViewOptions( NULL ),
+/*N*/ pDocOptions( NULL ),
+/*N*/ pExtDocOptions( NULL ),
+/*N*/ pConsolidateDlgData( NULL ),
+/*N*/ pLoadedSymbolStringCellList( NULL ),
+/*N*/ aCurTextWidthCalcPos(MAXCOL,0,0),
+/*N*/ nFormulaCodeInTree(0),
+/*N*/ nXMLImportedFormulaCount( 0 ),
+/*N*/ nInterpretLevel(0),
+/*N*/ nMacroInterpretLevel(0),
+/*N*/ nInterpreterTableOpLevel(0),
+/*N*/ nMaxTableNumber( 0 ),
/*N*/ nFormulaTrackCount(0),
-/*N*/ bInsertingFromOtherDoc( FALSE ),
- bImportingXML( FALSE ), // #i41083# this has to be set in ScXMLImport::startDocument
/*N*/ nHardRecalcState(0),
+/*N*/ nVisibleTab( 0 ),
+/*N*/ eLinkMode(LM_UNKNOWN),
+/*N*/ bProtected( FALSE ),
+/*N*/ bAutoCalc( eMode == SCDOCMODE_DOCUMENT ),
+/*N*/ bAutoCalcShellDisabled( FALSE ),
+/*N*/ bForcedFormulaPending( FALSE ),
+/*N*/ bCalculatingFormulaTree( FALSE ),
+/*N*/ bIsClip( eMode == SCDOCMODE_CLIP ),
+/*N*/ bCutMode( FALSE ),
+/*N*/ bIsUndo( eMode == SCDOCMODE_UNDO ),
+/*N*/ bIsEmbedded( FALSE ),
+/*N*/ bNoSetDirty( FALSE ),
+/*N*/ bInsertingFromOtherDoc( FALSE ),
+ bImportingXML( FALSE ), // #i41083# this has to be set in ScXMLImport::startDocument
/*N*/ bCalcingAfterLoad( FALSE ),
/*N*/ bNoListening( FALSE ),
/*N*/ bLoadingDone( TRUE ),
-/*N*/ nVisibleTab( 0 ),
/*N*/ bIdleDisabled( FALSE ),
/*N*/ bInLinkUpdate( FALSE ),
-/*N*/ bDetectiveDirty( FALSE ),
-/*N*/ nMacroCallMode( SC_MACROCALL_ALLOWED ),
-/*N*/ bHasMacroFunc( FALSE ),
/*N*/ bChartListenerCollectionNeedsUpdate( FALSE ),
/*N*/ bHasForcedFormulas( FALSE ),
-/*N*/ nVisSpellState( 0 ),
-/*N*/ pOtherObjects( NULL ),
-/*N*/ pClipData( NULL ),
-/*N*/ nFormulaCodeInTree(0),
-/*N*/ nInterpretLevel(0),
-/*N*/ nMacroInterpretLevel(0),
-/*N*/ nInterpreterTableOpLevel(0),
/*N*/ bLostData(FALSE),
-/*N*/ pDetOpList(NULL),
/*N*/ bInDtorClear( FALSE ),
/*N*/ bExpandRefs( FALSE ),
-/*N*/ pUnoBroadcaster( NULL ),
-/*N*/ pChangeTrack( NULL ),
-/*N*/ pChangeViewSettings( NULL ),
-/*N*/ pEditEngine( NULL ),
-/*N*/ eLinkMode(LM_UNKNOWN),
-/*N*/ pDPCollection( NULL ),
-/*N*/ pScriptTypeData( NULL ),
-/*N*/ nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
-/*N*/ nAsianKerning(SC_ASIANKERNING_INVALID),
-/*N*/ pLoadedSymbolStringCellList( NULL ),
-/*N*/ bPastingDrawFromOtherDoc( FALSE ),
-/*N*/ pCacheFieldEditEngine( NULL ),
-/*N*/ nInDdeLinkUpdate( 0 ),
-/*N*/ nXMLImportedFormulaCount( 0 ),
-/*N*/ bInUnoBroadcast( FALSE ),
-/*N*/ bStyleSheetUsageInvalid( TRUE )
+/*N*/ bDetectiveDirty( FALSE ),
+/*N*/ nMacroCallMode( SC_MACROCALL_ALLOWED ),
+/*N*/ bHasMacroFunc( FALSE ),
+/*N*/ nVisSpellState( 0 ),
+/*N*/ nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
+/*N*/ nAsianKerning(SC_ASIANKERNING_INVALID),
+/*N*/ bPastingDrawFromOtherDoc( FALSE ),
+/*N*/ nInDdeLinkUpdate( 0 ),
+/*N*/ bInUnoBroadcast( FALSE ),
+/*N*/ bStyleSheetUsageInvalid( TRUE )
/*N*/ {
/*N*/ eSrcSet = gsl_getSystemTextEncoding();
/*N*/ nSrcVer = SC_CURRENT_VERSION;
@@ -1278,7 +1277,7 @@ namespace binfilter {
/*N*/ for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch !!!
/*N*/ {
/*?*/ ScRangeData* pSrcData = (*pSrcDoc->pRangeName)[i];
-/*?*/ USHORT nOldIndex = pSrcData->GetIndex();
+/*?*/ /*USHORT nOldIndex =*/ pSrcData->GetIndex();
/*?*/ BOOL bInUse = FALSE;
/*?*/ for (USHORT j = 0; !bInUse && (j <= MAXTAB); j++)
/*?*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 09dfd5b..079f0e9 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -508,21 +508,17 @@ using namespace ::com::sun::star;
-/*N*/ void ScDocument::Fill(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, const ScMarkData& rMark,
-/*N*/ USHORT nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
-/*N*/ double nStepValue, double nMaxValue)
+/*N*/ void ScDocument::Fill(USHORT, USHORT, USHORT, USHORT, const ScMarkData&, USHORT, FillDir, FillCmd, FillDateCmd, double, double)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nCol1, nCol2 );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void ScDocument::AutoFormat( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow,
-/*N*/ USHORT nFormatNo, const ScMarkData& rMark )
+/*N*/ void ScDocument::AutoFormat( USHORT, USHORT, USHORT, USHORT, USHORT, const ScMarkData& )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nStartCol, nEndCol );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
// Outline anpassen
/*N*/ BOOL ScDocument::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab, BOOL bShow )
@@ -543,21 +539,17 @@ using namespace ::com::sun::star;
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void ScDocument::Sort(USHORT nTab, const ScSortParam& rSortParam, BOOL bKeepQuery)
+/*N*/ void ScDocument::Sort(USHORT, const ScSortParam&, BOOL)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ USHORT ScDocument::Query(USHORT nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub)
+/*N*/ USHORT ScDocument::Query(USHORT, const ScQueryParam&, BOOL)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return 0;
/*N*/ }
-
-
-
-
/*N*/ BOOL ScDocument::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, USHORT nTab, ScQueryParam& rQueryParam)
/*N*/ {
/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
@@ -567,10 +559,9 @@ using namespace ::com::sun::star;
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::HasColHeader( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow,
-/*N*/ USHORT nTab )
+/*N*/ BOOL ScDocument::HasColHeader( USHORT, USHORT, USHORT, USHORT, USHORT )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab))
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index b5bfdb0..68c9c6a 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -329,10 +329,10 @@ SO2_DECL_REF(SvInPlaceObject)
/*N*/ return FALSE;
/*N*/ }
-/*N*/ SchMemChart* ScDocument::FindChartData(const String& rName, BOOL bForModify)
+/*N*/ SchMemChart* ScDocument::FindChartData(const String&, BOOL)
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (!pDrawLayer)
-/*N*/ return NULL; // nix
+/*N*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ return NULL;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index 918fea3..556d7fd 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -383,7 +383,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem )
+/*N*/ BOOL ScDocument::UpdateDdeLink( const String&, const String&, const String& )
/*N*/ {
/*N*/ // fuer refresh() per StarOne Api
/*N*/ // ResetValue() fuer einzelnen Link nicht noetig
@@ -392,7 +392,7 @@ namespace binfilter {
/*N*/ BOOL bFound = FALSE;
/*N*/ if (pLinkManager)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ::binfilter::SvBaseLinks& rLinks = pLinkManager->GetLinks();
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return bFound;
/*N*/ }
@@ -494,33 +494,32 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::GetDdeLinkResult(const ScMatrix* pMatrix, USHORT nCol, USHORT nRow, String& rStrValue, double& rDoubValue, BOOL& bIsString)
+/*N*/ BOOL ScDocument::GetDdeLinkResult(const ScMatrix*, USHORT, USHORT, String&, double&, BOOL&)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pMatrix)
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ return TRUE;
/*N*/ }
-/*N*/ void ScDocument::CreateDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode )
+/*N*/ void ScDocument::CreateDdeLink(const String&, const String&, const String&, const BYTE)
/*N*/ {
- // DDE-Link anlegen und nicht updaten (z.B. fuer Excel-Import,
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // damit nicht ohne Nachfrage Verbindungen aufgebaut werden)
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ BOOL ScDocument::FindDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode, USHORT& nPos )
+/*N*/ BOOL ScDocument::FindDdeLink(const String&, const String&, const String&, const BYTE, USHORT&)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager)
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::CreateDdeLinkResultDimension(USHORT nPos, USHORT nCols, USHORT nRows, ScMatrix*& pMatrix)
+/*N*/ BOOL ScDocument::CreateDdeLinkResultDimension(USHORT, USHORT, USHORT, ScMatrix*&)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nDdeCount = 0;
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
-void ScDocument::SetDdeLinkResult(ScMatrix* pMatrix, const USHORT nCol, const USHORT nRow, const String& rStrValue, const double& rDoubValue, BOOL bString, BOOL bEmpty)
+void ScDocument::SetDdeLinkResult(ScMatrix*, const USHORT, const USHORT, const String&, const double&, BOOL, BOOL )
{
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pMatrix, "there is no matrix");
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
//------------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index 49c9ff4..3666946 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -133,9 +133,9 @@ namespace binfilter {
/*N*/ pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table
/*N*/ if (pTab[nTab])
/*N*/ {
-/*N*/ String aName;
-/*N*/ pTab[nTab]->GetName(aName);
-/*N*/ pDrawLayer->ScRenamePage( nTab, aName );
+/*N*/ String aLclName;
+/*N*/ pTab[nTab]->GetName(aLclName);
+/*N*/ pDrawLayer->ScRenamePage( nTab, aLclName );
/*N*/
/*N*/ pTab[nTab]->SetDrawPageSize(); // #54782# sofort die richtige Groesse
/*N*/ }
@@ -363,11 +363,11 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ BOOL ScDocument::IsPrintEmpty( USHORT nTab, USHORT nStartCol, USHORT nStartRow,
-/*N*/ USHORT nEndCol, USHORT nEndRow, BOOL bLeftIsEmpty,
-/*N*/ ScRange* pLastRange, Rectangle* pLastMM ) const
+/*N*/ BOOL ScDocument::IsPrintEmpty( USHORT, USHORT, USHORT,
+/*N*/ USHORT, USHORT, BOOL,
+/*N*/ ScRange*, Rectangle* ) const
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow ))
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return TRUE;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 15d1eab..b18f209 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -373,7 +373,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDocument::RenameTab( USHORT nTab, const String& rName, BOOL bUpdateRef,
+/*N*/ BOOL ScDocument::RenameTab( USHORT nTab, const String& rName, BOOL /*bUpdateRef*/,
/*N*/ BOOL bExternalDocument )
/*N*/ {
/*N*/ BOOL bValid = FALSE;
@@ -778,27 +778,16 @@ namespace binfilter {
/*N*/ pRefUndoDoc, pUndoOutline );
/*N*/ }
-
-// fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert
-// (ohne Paint)
-
-
-
-
-
-
-/*N*/ BOOL ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew )
+/*N*/ BOOL ScDocument::CanFitBlock( const ScRange&, const ScRange& )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 if ( rOld == rNew )
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
-
-/*N*/ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear )
+/*N*/ void ScDocument::FitBlock( const ScRange&, const ScRange&, BOOL )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (bClear)
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
/*N*/ void ScDocument::DeleteArea(USHORT nCol1, USHORT nRow1,
/*N*/ USHORT nCol2, USHORT nRow2,
/*N*/ const ScMarkData& rMark, USHORT nDelFlag)
@@ -914,7 +903,7 @@ namespace binfilter {
/*N*/ USHORT nCol2, USHORT nRow2,
/*N*/ BOOL bCut, ScDocument* pClipDoc,
/*N*/ BOOL bAllTabs, const ScMarkData* pMarks,
-/*N*/ BOOL bKeepScenarioFlags, BOOL bIncludeObjects)
+/*N*/ BOOL /*bKeepScenarioFlags*/, BOOL bIncludeObjects)
/*N*/ {
/*N*/ DBG_ASSERT( bAllTabs || pMarks, "CopyToClip: ScMarkData fehlt" );
/*N*/
@@ -968,36 +957,33 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Rectangle aObjRect = GetMMRect
/*N*/ }
/*N*/ }
-void ScDocument::StartListeningFromClip( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, const ScMarkData& rMark, USHORT nInsFlag )
+void ScDocument::StartListeningFromClip( USHORT, USHORT, USHORT, USHORT, const ScMarkData&, USHORT )
{
}
-
-/*N*/ void ScDocument::BroadcastFromClip( USHORT nCol1, USHORT nRow1,
-/*N*/ USHORT nCol2, USHORT nRow2,
-/*N*/ const ScMarkData& rMark, USHORT nInsFlag )
+/*N*/ void ScDocument::BroadcastFromClip( USHORT, USHORT,
+/*N*/ USHORT, USHORT,
+/*N*/ const ScMarkData&, USHORT )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (nInsFlag & IDF_CONTENTS)
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-/*N*/ void ScDocument::CopyBlockFromClip( USHORT nCol1, USHORT nRow1,
-/*N*/ USHORT nCol2, USHORT nRow2,
-/*N*/ const ScMarkData& rMark,
-/*N*/ short nDx, short nDy,
-/*N*/ const ScCopyBlockFromClipParams* pCBFCP )
+/*N*/ void ScDocument::CopyBlockFromClip( USHORT, USHORT,
+/*N*/ USHORT, USHORT,
+/*N*/ const ScMarkData&,
+/*N*/ short, short,
+/*N*/ const ScCopyBlockFromClipParams* )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ScTable** ppClipTab = pCBFCP->pClipDoc->pTab;
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-/*N*/ void ScDocument::CopyNonFilteredFromClip( USHORT nCol1, USHORT nRow1,
-/*N*/ USHORT nCol2, USHORT nRow2,
-/*N*/ const ScMarkData& rMark,
-/*N*/ short nDx, short nDy,
-/*N*/ const ScCopyBlockFromClipParams* pCBFCP )
+/*N*/ void ScDocument::CopyNonFilteredFromClip( USHORT, USHORT,
+/*N*/ USHORT, USHORT,
+/*N*/ const ScMarkData&,
+/*N*/ short, short,
+/*N*/ const ScCopyBlockFromClipParams* )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for ranges of consecutive non-filtered rows
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -1040,11 +1026,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
A proper solution would ask the user how to proceed.
The adjustment of the indices in the formulas is done later.
*/
-/*N*/ ScRangeData* pClipData = (*pClipDoc->pRangeName)[i];
-/*N*/ if ( pRangeName->SearchName( pClipData->GetName(), k ) )
+/*N*/ ScRangeData* pLclClipData = (*pClipDoc->pRangeName)[i];
+/*N*/ if ( pRangeName->SearchName( pLclClipData->GetName(), k ) )
/*N*/ {
/*N*/ pClipRangeNames[i] = NULL; // range name not inserted
-/*N*/ USHORT nOldIndex = pClipData->GetIndex();
+/*N*/ USHORT nOldIndex = pLclClipData->GetIndex();
/*N*/ USHORT nNewIndex = ((*pRangeName)[k])->GetIndex();
/*N*/ aClipRangeMap.SetPair( i, nOldIndex, nNewIndex );
/*N*/ if ( !bRangeNameReplace )
@@ -1052,14 +1038,14 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ ScRangeData* pData = new ScRangeData( *pClipData );
+/*N*/ ScRangeData* pData = new ScRangeData( *pLclClipData );
/*N*/ pData->SetDocument(this);
/*N*/ if ( pRangeName->FindIndex( pData->GetIndex() ) )
/*N*/ pData->SetIndex(0); // need new index, done in Insert
/*N*/ if ( pRangeName->Insert( pData ) )
/*N*/ {
/*N*/ pClipRangeNames[i] = pData;
-/*N*/ USHORT nOldIndex = pClipData->GetIndex();
+/*N*/ USHORT nOldIndex = pLclClipData->GetIndex();
/*N*/ USHORT nNewIndex = pData->GetIndex();
/*N*/ aClipRangeMap.SetPair( i, nOldIndex, nNewIndex );
/*N*/ if ( !bRangeNameReplace )
@@ -1069,7 +1055,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ { // must be an overflow
/*N*/ delete pData;
/*N*/ pClipRangeNames[i] = NULL;
-/*N*/ aClipRangeMap.SetPair( i, pClipData->GetIndex(), 0 );
+/*N*/ aClipRangeMap.SetPair( i, pLclClipData->GetIndex(), 0 );
/*N*/ bRangeNameReplace = TRUE;
/*N*/ }
/*N*/ }
@@ -1102,10 +1088,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ DeleteArea(nCol1, nRow1, nCol2, nRow2, rMark, nDelFlag);
/*N*/
/*N*/ bInsertingFromOtherDoc = TRUE; // kein Broadcast/Listener aufbauen bei Insert
-/*N*/ USHORT nC1 = nCol1;
-/*N*/ USHORT nR1 = nRow1;
-/*N*/ USHORT nC2 = nC1 + nXw;
-/*N*/ USHORT nR2 = nR1 + nYw;
+/*N*/ USHORT nC1_a = nCol1;
+/*N*/ USHORT nR1_a = nRow1;
+/*N*/ USHORT nC2_a = nC1_a + nXw;
+/*N*/ USHORT nR2_a = nR1_a + nYw;
/*N*/ USHORT nClipStartCol = pClipDoc->aClipRange.aStart.Col();
/*N*/ USHORT nClipStartRow = pClipDoc->aClipRange.aStart.Row();
/*N*/
@@ -1141,22 +1127,22 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ {
/*N*/ do
/*N*/ {
-/*N*/ short nDx = ((short)nC1) - nClipStartCol;
-/*N*/ short nDy = ((short)nR1) - nClipStartRow;
+/*N*/ short nDx = ((short)nC1_a) - nClipStartCol;
+/*N*/ short nDy = ((short)nR1_a) - nClipStartRow;
/*N*/ if ( bIncludeFiltered )
-/*N*/ CopyBlockFromClip( nC1, nR1, nC2, nR2, rMark, nDx, nDy, &aCBFCP );
+/*N*/ CopyBlockFromClip( nC1_a, nR1_a, nC2_a, nR2_a, rMark, nDx, nDy, &aCBFCP );
/*N*/ else
-/*N*/ CopyNonFilteredFromClip( nC1, nR1, nC2, nR2, rMark, nDx, nDy, &aCBFCP );
-/*N*/ nC1 = nC2 + 1;
-/*N*/ nC2 = Min((USHORT)(nC1 + nXw), nCol2);
+/*N*/ CopyNonFilteredFromClip( nC1_a, nR1_a, nC2_a, nR2_a, rMark, nDx, nDy, &aCBFCP );
+/*N*/ nC1_a = nC2_a + 1;
+/*N*/ nC2_a = Min((USHORT)(nC1_a + nXw), nCol2);
/*N*/ }
-/*N*/ while (nC1 <= nCol2);
-/*N*/ nC1 = nCol1;
-/*N*/ nC2 = nC1 + nXw;
-/*N*/ nR1 = nR2 + 1;
-/*N*/ nR2 = Min((USHORT)(nR1 + nYw), nRow2);
+/*N*/ while (nC1_a <= nCol2);
+/*N*/ nC1_a = nCol1;
+/*N*/ nC2_a = nC1_a + nXw;
+/*N*/ nR1_a = nR2_a + 1;
+/*N*/ nR2_a = Min((USHORT)(nR1_a + nYw), nRow2);
/*N*/ }
-/*N*/ while (nR1 <= nRow2);
+/*N*/ while (nR1_a <= nRow2);
/*N*/
/*N*/ ScColumn::bDoubleAlloc = bOldDouble;
/*N*/
@@ -1176,10 +1162,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ pClipRangeNames[i]->ReplaceRangeNamesInUse( aClipRangeMap );
/*N*/ }
/*N*/ // then update the formulas, they might need the just updated range names
-/*N*/ USHORT nC1 = nCol1;
-/*N*/ USHORT nR1 = nRow1;
-/*N*/ USHORT nC2 = nC1 + nXw;
-/*N*/ USHORT nR2 = nR1 + nYw;
+/*N*/ USHORT nC1_b = nCol1;
+/*N*/ USHORT nR1_b = nRow1;
+/*N*/ USHORT nC2_b = nC1_b + nXw;
+/*N*/ USHORT nR2_b = nR1_b + nYw;
/*N*/ do
/*N*/ {
/*N*/ do
@@ -1187,17 +1173,17 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ for (k = 0; k <= MAXTAB; k++)
/*N*/ {
/*N*/ if ( pTab[k] && rMark.GetTableSelect(k) )
-/*N*/ pTab[k]->ReplaceRangeNamesInUse(nC1, nR1,
-/*N*/ nC2, nR2, aClipRangeMap );
+/*N*/ pTab[k]->ReplaceRangeNamesInUse(nC1_b, nR1_b,
+/*N*/ nC2_b, nR2_b, aClipRangeMap );
/*N*/ }
-/*N*/ nC1 = nC2 + 1;
-/*N*/ nC2 = Min((USHORT)(nC1 + nXw), nCol2);
-/*N*/ } while (nC1 <= nCol2);
-/*N*/ nC1 = nCol1;
-/*N*/ nC2 = nC1 + nXw;
-/*N*/ nR1 = nR2 + 1;
-/*N*/ nR2 = Min((USHORT)(nR1 + nYw), nRow2);
-/*N*/ } while (nR1 <= nRow2);
+/*N*/ nC1_b = nC2_b + 1;
+/*N*/ nC2_b = Min((USHORT)(nC1_b + nXw), nCol2);
+/*N*/ } while (nC1_b <= nCol2);
+/*N*/ nC1_b = nCol1;
+/*N*/ nC2_b = nC1_b + nXw;
+/*N*/ nR1_b = nR2_b + 1;
+/*N*/ nR2_b = Min((USHORT)(nR1_b + nYw), nRow2);
+/*N*/ } while (nR1_b <= nRow2);
/*N*/ }
/*N*/ if ( pClipRangeNames )
/*N*/ delete [] pClipRangeNames;
@@ -1212,25 +1198,11 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for
/*N*/ }
/*N*/ }
-
-
-
-/*N*/ void ScDocument::GetClipArea(USHORT& nClipX, USHORT& nClipY, BOOL bIncludeFiltered)
+/*N*/ void ScDocument::GetClipArea(USHORT&, USHORT&, BOOL)
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void ScDocument::PutCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBaseCell* pCell, BOOL bForceTab )
/*N*/ {
/*N*/ if (VALIDTAB(nTab))
@@ -1835,7 +1807,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
/*N*/ return bRet;
/*N*/ }
-/*N*/ BOOL ScDocument::GetRowDefault( USHORT nTab, USHORT nRow, USHORT nLastCol, USHORT& nDefault)
+/*N*/ BOOL ScDocument::GetRowDefault( USHORT, USHORT, USHORT, USHORT&)
/*N*/ {
/*N*/ BOOL bRet(FALSE);
/*N*/ return bRet;
@@ -2002,15 +1974,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
/*N*/ }
/*N*/ }
-
-/*N*/ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001
+/*N*/ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet&, BOOL ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
-
-
-
-
/*N*/ BOOL ScDocument::ApplyFlagsTab( USHORT nStartCol, USHORT nStartRow,
/*N*/ USHORT nEndCol, USHORT nEndRow, USHORT nTab, INT16 nFlags )
/*N*/ {
@@ -2022,20 +1989,12 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
/*N*/ return FALSE;
/*N*/ }
-
-
-
-/*N*/ BOOL ScDocument::RemoveFlagsTab( USHORT nStartCol, USHORT nStartRow,
-/*N*/ USHORT nEndCol, USHORT nEndRow, USHORT nTab, INT16 nFlags )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ BOOL ScDocument::RemoveFlagsTab( USHORT, USHORT,
+/*N*/ USHORT, USHORT, USHORT, INT16 )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
-
-
-
-
-
/*N*/ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep )
/*N*/ {
/*N*/ SfxItemSet* pSet = NULL;
@@ -2177,10 +2136,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
/*N*/ nMask );
/*N*/ }
-/*N*/ BOOL ScDocument::IsBlockEmpty( USHORT nTab, USHORT nStartCol, USHORT nStartRow,
-/*N*/ USHORT nEndCol, USHORT nEndRow ) const
+/*N*/ BOOL ScDocument::IsBlockEmpty( USHORT /*nTab*/, USHORT /*nStartCol*/, USHORT /*nStartRow*/,
+/*N*/ USHORT /*nEndCol*/, USHORT /*nEndRow*/ ) const
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab))
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
@@ -2513,8 +2472,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol, nSt
/*N*/ {
/*N*/ const SfxItemSet* pSet = &rAttr.GetItemSet();
/*N*/ BOOL bSet = FALSE;
-/*N*/ USHORT i;
-/*N*/ for (i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END && !bSet; i++)
+/*N*/ for (USHORT i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END && !bSet; i++)
/*N*/ if (pSet->GetItemState(i) == SFX_ITEM_SET)
/*N*/ bSet = TRUE;
/*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index c6187c2..0c79d83 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -249,10 +249,16 @@ namespace binfilter {
/*N*/ ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
/*N*/ nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab),
-/*N*/ nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
-/*N*/ bHasHeader(r.bHasHeader),bInplace(r.bInplace),bCaseSens(r.bCaseSens),
-/*N*/ bRegExp(r.bRegExp),bDuplicate(r.bDuplicate),bByRow(r.bByRow),
-/*N*/ bDestPers(r.bDestPers)
+/*N*/ bHasHeader(r.bHasHeader),
+/*N*/ bByRow(r.bByRow),
+/*N*/ bInplace(r.bInplace),
+/*N*/ bCaseSens(r.bCaseSens),
+/*N*/ bRegExp(r.bRegExp),
+/*N*/ bDuplicate(r.bDuplicate),
+/*N*/ bDestPers(r.bDestPers),
+/*N*/ nDestTab(r.nDestTab),
+/*N*/ nDestCol(r.nDestCol),
+/*N*/ nDestRow(r.nDestRow)
/*N*/ {
/*N*/ nEntryCount = 0;
/*N*/
@@ -312,12 +318,11 @@ namespace binfilter {
//------------------------------------------------------------------------
-BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+BOOL ScQueryParam::operator==( const ScQueryParam& /*rOther*/ ) const
{
BOOL bEqual = FALSE;
-
// Anzahl der Queries gleich?
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nUsed = 0;
+ DBG_BF_ASSERT(0, "STRIP");
return bEqual;
}
@@ -486,9 +491,15 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
/*N*/ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) :
/*N*/ nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),
-/*N*/ bReplace(r.bReplace),bPagebreak(r.bPagebreak),bCaseSens(r.bCaseSens),
-/*N*/ bDoSort(r.bDoSort),bAscending(r.bAscending),bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),
-/*N*/ bIncludePattern(r.bIncludePattern),bRemoveOnly(r.bRemoveOnly)
+/*N*/ bRemoveOnly(r.bRemoveOnly),
+/*N*/ bReplace(r.bReplace),
+/*N*/ bPagebreak(r.bPagebreak),
+/*N*/ bCaseSens(r.bCaseSens),
+/*N*/ bDoSort(r.bDoSort),
+/*N*/ bAscending(r.bAscending),
+/*N*/ bUserDef(r.bUserDef),
+/*N*/ nUserIndex(r.nUserIndex),
+/*N*/ bIncludePattern(r.bIncludePattern)
/*N*/ {
/*N*/ for (USHORT i=0; i<MAXSUBTOTAL; i++)
/*N*/ {
@@ -607,10 +618,13 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
//------------------------------------------------------------------------
/*N*/ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) :
-/*N*/ ppDataAreas( NULL ),
/*N*/ nCol(r.nCol),nRow(r.nRow),nTab(r.nTab),
-/*N*/ bByCol(r.bByCol),bByRow(r.bByRow),bReferenceData(r.bReferenceData),
-/*N*/ nDataAreaCount(0),eFunction(r.eFunction)
+/*N*/ eFunction(r.eFunction),
+/*N*/ nDataAreaCount(0),
+/*N*/ ppDataAreas( NULL ),
+/*N*/ bByCol(r.bByCol),
+/*N*/ bByRow(r.bByRow),
+/*N*/ bReferenceData(r.bReferenceData)
/*N*/ {
/*N*/ if ( r.nDataAreaCount > 0 )
/*N*/ {
@@ -737,12 +751,14 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
/*N*/ ScPivotParam::ScPivotParam( const ScPivotParam& r )
/*N*/ : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ),
+/*N*/ ppLabelArr( NULL ), nLabels(0),
+/*N*/ nColCount(0),
+/*N*/ nRowCount(0),
+/*N*/ nDataCount(0),
/*N*/ bIgnoreEmptyRows(r.bIgnoreEmptyRows),
/*N*/ bDetectCategories(r.bDetectCategories),
/*N*/ bMakeTotalCol(r.bMakeTotalCol),
-/*N*/ bMakeTotalRow(r.bMakeTotalRow),
-/*N*/ ppLabelArr( NULL ), nLabels(0),
-/*N*/ nColCount(0), nRowCount(0), nDataCount(0)
+/*N*/ bMakeTotalRow(r.bMakeTotalRow)
/*N*/ {
/*N*/ SetLabelData ( r.ppLabelArr, r.nLabels );
/*N*/ SetPivotArrays ( r.aColArr, r.aRowArr, r.aDataArr,
@@ -794,14 +810,14 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
//------------------------------------------------------------------------
-/*N*/ void ScPivotParam::SetPivotArrays ( const PivotField* pColArr,
-/*N*/ const PivotField* pRowArr,
-/*N*/ const PivotField* pDataArr,
-/*N*/ USHORT nColCnt,
-/*N*/ USHORT nRowCnt,
-/*N*/ USHORT nDataCnt )
+/*N*/ void ScPivotParam::SetPivotArrays ( const PivotField*,
+/*N*/ const PivotField*,
+/*N*/ const PivotField*,
+/*N*/ USHORT,
+/*N*/ USHORT,
+/*N*/ USHORT )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearPivotArrays();
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
//------------------------------------------------------------------------
@@ -1228,10 +1244,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearPivotArrays();
/*N*/ sal_Unicode* p = aTmp.GetBufferAccess();
/*N*/ p[ nPos ] = 0;
/*N*/ BOOL bExternal = FALSE;
-/*N*/ if( nRes1 = lcl_ConvertSingleRef( bExternal, p, pDoc, aStart ) )
+/*N*/ if(( nRes1 = lcl_ConvertSingleRef( bExternal, p, pDoc, aStart ) ))
/*N*/ {
/*N*/ aEnd = aStart; // die Tab _muss_ gleich sein, so ist`s weniger Code
-/*N*/ if ( nRes2 = lcl_ConvertSingleRef( bExternal, p + nPos+ 1, pDoc, aEnd ) )
+/*N*/ if (( nRes2 = lcl_ConvertSingleRef( bExternal, p + nPos+ 1, pDoc, aEnd ) ))
/*N*/ {
/*N*/ if ( bExternal && aStart.Tab() != aEnd.Tab() )
/*N*/ nRes2 &= ~SCA_VALID_TAB; // #REF!
diff --git a/binfilter/bf_sc/source/core/data/sc_patattr.cxx b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
index 86a1aa3..d326645 100644
--- a/binfilter/bf_sc/source/core/data/sc_patattr.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
@@ -140,7 +140,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ StrCmp( GetStyleName(), ((const ScPatternAttr&)rCmp).GetStyleName() ) );
/*N*/ }
-/*N*/ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, USHORT nVersion ) const
+/*N*/ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, USHORT /*nVersion*/ ) const
/*N*/ {
/*N*/ String* pStr;
/*N*/ BOOL bHasStyle;
@@ -157,18 +157,18 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ else
/*N*/ pStr = new String( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
/*N*/
-/*N*/ SfxItemSet *pSet = new SfxItemSet( *GetItemSet().GetPool(),
+/*N*/ SfxItemSet *pLclSet = new SfxItemSet( *GetItemSet().GetPool(),
/*N*/ ATTR_PATTERN_START, ATTR_PATTERN_END );
-/*N*/ pSet->Load( rStream );
+/*N*/ pLclSet->Load( rStream );
/*N*/
-/*N*/ ScPatternAttr* pPattern = new ScPatternAttr( pSet );
+/*N*/ ScPatternAttr* pPattern = new ScPatternAttr( pLclSet );
/*N*/
/*N*/ pPattern->pName = pStr;
/*N*/
/*N*/ return pPattern;
/*N*/ }
-/*N*/ SvStream& ScPatternAttr::Store(SvStream& rStream, USHORT nItemVersion) const
+/*N*/ SvStream& ScPatternAttr::Store(SvStream& rStream, USHORT /*nItemVersion*/) const
/*N*/ {
/*N*/ rStream << (BOOL)TRUE;
/*N*/
@@ -1005,7 +1005,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ BOOL ScPatternAttr::IsVisible() const
/*N*/ {
/*N*/ const SfxItemSet& rSet = GetItemSet();
-/*N*/ const SfxItemPool* pPool = rSet.GetPool();
+/*N*/ /*const SfxItemPool* pPool =*/ rSet.GetPool();
/*N*/
/*N*/ const SfxPoolItem* pItem;
/*N*/ SfxItemState eState;
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index c445e61..3ecee99 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -114,36 +114,36 @@ extern BOOL bIsOlk, bOderSo;
/*N*/ ScTable::ScTable( ScDocument* pDoc, USHORT nNewTab, const String& rNewName,
/*N*/ BOOL bColInfo, BOOL bRowInfo ) :
-/*N*/ pDocument( pDoc ),
/*N*/ aName( rNewName ),
-/*N*/ nTab( nNewTab ),
/*N*/ bScenario( FALSE ),
-/*N*/ bActiveScenario( FALSE ),
-/*N*/ nScenarioFlags( 0 ),
-/*N*/ aScenarioColor( COL_LIGHTGRAY ),
/*N*/ nLinkMode( 0 ),
+/*N*/ aPageStyle( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ),
+/*N*/ bPageSizeValid( FALSE ),
+/*N*/ nRepeatStartX( REPEAT_NONE ),
+/*N*/ nRepeatStartY( REPEAT_NONE ),
+/*N*/ bProtected( FALSE ),
/*N*/ pColWidth( NULL ),
-/*N*/ pColFlags( NULL ),
/*N*/ pRowHeight( NULL ),
+/*N*/ pColFlags( NULL ),
/*N*/ pRowFlags( NULL ),
/*N*/ pOutlineTable( NULL ),
+/*N*/ bTableAreaValid( FALSE ),
/*N*/ bVisible( TRUE ),
+/*N*/ nTab( nNewTab ),
+/*N*/ nRecalcLvl( 0 ),
+/*N*/ pDocument( pDoc ),
/*N*/ pSearchParam( NULL ),
/*N*/ pSearchText ( NULL ),
-/*N*/ bProtected( FALSE ),
-/*N*/ nRecalcLvl( 0 ),
-/*N*/ bPageSizeValid( FALSE ),
-/*N*/ nRepeatStartX( REPEAT_NONE ),
-/*N*/ nRepeatStartY( REPEAT_NONE ),
-/*N*/ aPageStyle( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ),
-/*N*/ bTableAreaValid( FALSE ),
+/*N*/ pSortCollator( NULL ),
/*N*/ nPrintRangeCount( 0 ),
/*N*/ pPrintRanges( NULL ),
/*N*/ pRepeatColRange( NULL ),
/*N*/ pRepeatRowRange( NULL ),
/*N*/ nLockCount( 0 ),
/*N*/ pScenarioRanges( NULL ),
-/*N*/ pSortCollator( NULL )
+/*N*/ aScenarioColor( COL_LIGHTGRAY ),
+/*N*/ nScenarioFlags( 0 ),
+/*N*/ bActiveScenario( FALSE )
/*N*/ {
/*N*/ USHORT i;
/*N*/
@@ -310,9 +310,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nTab );
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ USHORT nRngStart;
-/*N*/ USHORT nRngEnd;
-/*N*/ USHORT nLast = 0;
+/*N*/ USHORT nRngStart(0);
+/*N*/ USHORT nRngEnd(0);
+/*N*/ USHORT nLast(0);
/*N*/ USHORT i;
/*N*/ for (i=0; i<nCount; i++)
/*N*/ {
@@ -501,10 +501,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nTab );
/*N*/ return bFound;
/*N*/ }
-/*N*/ void ScTable::GetDataArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rEndCol, USHORT& rEndRow,
-/*N*/ BOOL bIncludeOld )
+/*N*/ void ScTable::GetDataArea( USHORT&, USHORT&, USHORT&, USHORT&,
+/*N*/ BOOL )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bLeft = FALSE;
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -512,10 +512,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bLeft = FALSE;
-/*N*/ void ScTable::GetNextPos( USHORT& rCol, USHORT& rRow, short nMovX, short nMovY,
-/*N*/ BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
+/*N*/ void ScTable::GetNextPos( USHORT&, USHORT&, short, short,
+/*N*/ BOOL, BOOL, const ScMarkData& )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt?
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ BOOL ScTable::GetNextMarkedCell( USHORT& rCol, USHORT& rRow, const ScMarkData& rMark )
@@ -559,13 +559,13 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bUnprotected && !IsProtect
/*N*/ return FALSE; // alle Spalten durch
/*N*/ }
-/*N*/ void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
-/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2,
-/*N*/ short nDx, short nDy, short nDz )
+/*N*/ void ScTable::UpdateDrawRef( UpdateRefMode /*eUpdateRefMode*/, USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT nTab1,
+/*N*/ USHORT /*nCol2*/, USHORT /*nRow2*/, USHORT nTab2,
+/*N*/ short /*nDx*/, short /*nDy*/, short nDz )
/*N*/ {
/*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -713,15 +713,15 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScDrawLayer* pDrawLayer = pDocumen
/*N*/ return bInUse;
/*N*/ }
-/*N*/ void ScTable::ReplaceRangeNamesInUse(USHORT nCol1, USHORT nRow1,
-/*N*/ USHORT nCol2, USHORT nRow2,
-/*N*/ const ScIndexMap& rMap )
+/*N*/ void ScTable::ReplaceRangeNamesInUse(USHORT, USHORT,
+/*N*/ USHORT, USHORT,
+/*N*/ const ScIndexMap& )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for (USHORT i = nCol1; i <= nCol2 && (i <= MAXCOL); i++)
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void ScTable::ExtendPrintArea( OutputDevice* pDev,
-/*N*/ USHORT nStartCol, USHORT nStartRow, USHORT& rEndCol, USHORT nEndRow )
+/*N*/ USHORT /*nStartCol*/, USHORT nStartRow, USHORT& rEndCol, USHORT nEndRow )
/*N*/ {
/*N*/ if ( !pColFlags || !pRowFlags )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx
index 18a1078..d790a64 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -459,10 +459,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row(
/*N*/ }
-/*N*/ BOOL ScTable::SetString( USHORT nCol, USHORT nRow, USHORT nTab, const String& rString )
+/*N*/ BOOL ScTable::SetString( USHORT nCol, USHORT nRow, USHORT nInTab, const String& rString )
/*N*/ {
/*N*/ if (ValidColRow(nCol,nRow))
-/*N*/ return aCol[nCol].SetString( nRow, nTab, rString );
+/*N*/ return aCol[nCol].SetString( nRow, nInTab, rString );
/*N*/ else
/*N*/ return FALSE;
/*N*/ }
@@ -499,9 +499,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row(
/*N*/ rString.Erase();
/*N*/ }
-/*N*/ double ScTable::GetValue( USHORT nCol, USHORT nRow )
+/*N*/ double ScTable::GetValue( USHORT, USHORT )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0.0;//STRIP001 if (ValidColRow( nCol, nRow ))
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0.0;
/*N*/ }
/*N*/ BOOL ScTable::GetNote( USHORT nCol, USHORT nRow, ScPostIt& rNote)
@@ -580,7 +580,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row(
/*N*/ }
-/*N*/ void ScTable::SetDirty( const ScRange& rRange )
+/*N*/ void ScTable::SetDirty( const ScRange& )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bOldAutoCalc = pDocument->GetAutoCalc();
/*N*/ }
@@ -887,17 +887,17 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row(
/*N*/ }
-/*N*/ void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags,
-/*N*/ USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow ) const
+/*N*/ void ScTable::MergeBlockFrame( SvxBoxItem*, SvxBoxInfoItem*, ScLineFlags&,
+/*N*/ USHORT, USHORT, USHORT, USHORT ) const
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
-/*N*/ USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow )
+/*N*/ void ScTable::ApplyBlockFrame( const SvxBoxItem*, const SvxBoxInfoItem*,
+/*N*/ USHORT, USHORT, USHORT, USHORT )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
+DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -1121,7 +1121,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nSt
/*N*/ BOOL ScTable::SetRowHeightRange( USHORT nStartRow, USHORT nEndRow, USHORT nNewHeight,
-/*N*/ double nPPTX,double nPPTY )
+/*N*/ double /*nPPTX*/,double nPPTY )
/*N*/ {
/*N*/ BOOL bChanged = FALSE;
/*N*/ if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowHeight)
@@ -1442,10 +1442,10 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nSt
/*N*/ }
-/*N*/ BOOL ScTable::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, BOOL bShow )
+/*N*/ BOOL ScTable::UpdateOutlineCol( USHORT /*nStartCol*/, USHORT /*nEndCol*/, BOOL /*bShow*/ )
/*N*/ {
/*N*/ if (pOutlineTable && pColFlags)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, pColFlags );
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
/*N*/ else
/*N*/ return FALSE;
/*N*/ }
commit 7c0705585c5df1e405609b59a0cb5a8f0809ed9a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 3 13:08:41 2011 +0000
WaE: remove some more warnings
diff --git a/binfilter/bf_sc/source/core/data/sc_documen7.cxx b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
index 58973ea..9497677 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen7.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
@@ -332,12 +332,11 @@ ULONG erCountBCAFinds = 0;
/*N*/ ScBroadcasterList* pBC;
/*N*/ ScFormulaCell* pTrack;
/*N*/ ScFormulaCell* pNext;
-/*N*/ BOOL bIsChanged = TRUE;
/*N*/ pTrack = pFormulaTrack;
/*N*/ do
/*N*/ {
/*N*/ ScHint aHint( nHintId, pTrack->aPos, pTrack );
-/*N*/ if ( pBC = pTrack->GetBroadcaster() )
+/*N*/ if (( pBC = pTrack->GetBroadcaster() ))
/*N*/ pBC->Broadcast( aHint );
/*N*/ pBASM->AreaBroadcast( aHint );
/*N*/ // Repaint fuer bedingte Formate mit relativen Referenzen:
@@ -380,7 +379,7 @@ ULONG erCountBCAFinds = 0;
/*N*/ }
/*N*/ void ScDocument::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
-/*N*/ const ScRange& rRange, short nDx, short nDy, short nDz
+/*N*/ const ScRange& /*rRange*/, short nDx, short nDy, short nDz
/*N*/ )
/*N*/ {
/*N*/ BOOL bExpandRefsOld = IsExpandRefs();
diff --git a/binfilter/bf_sc/source/core/data/sc_markarr.cxx b/binfilter/bf_sc/source/core/data/sc_markarr.cxx
index 5912868..e55ceba 100644
--- a/binfilter/bf_sc/source/core/data/sc_markarr.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_markarr.cxx
@@ -133,7 +133,7 @@ namespace binfilter {
/*N*/ void ScMarkArray::SetMarkArea( USHORT nStartRow, USHORT nEndRow, BOOL bMarked )
/*N*/ {
-/*N*/ if ((nStartRow >= 0 && nStartRow <= MAXROW) && (nEndRow >= 0 && nEndRow <= MAXROW))
+/*N*/ if ((nStartRow <= MAXROW) && (nEndRow <= MAXROW))
/*N*/ {
/*N*/ if ((nStartRow == 0) && (nEndRow == MAXROW))
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx
index 4c81443..18a1078 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -1007,8 +1007,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nSt
/*N*/
/*N*/ BOOL bFound = FALSE;
/*N*/ USHORT i;
-/*N*/ USHORT nStart;
-/*N*/ USHORT nEnd;
+/*N*/ USHORT nStart(0);
+/*N*/ USHORT nEnd(0);
/*N*/ for (i=0; i<=MAXROW; i++)
/*N*/ {
/*N*/ if (pUsed[i])
diff --git a/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx b/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
index 2ff9d65..512ac99 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
@@ -93,28 +93,28 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
break;
case uno::TypeClass_SHORT:
{
- sal_Int16 nInt16;
+ sal_Int16 nInt16(0);
aAny >>= nInt16;
exportShort(nInt16, rName);
}
break;
case uno::TypeClass_LONG:
{
- sal_Int32 nInt32;
+ sal_Int32 nInt32(0);
aAny >>= nInt32;
exportInt(nInt32, rName);
}
break;
case uno::TypeClass_HYPER:
{
- sal_Int64 nInt64;
+ sal_Int64 nInt64(0);
aAny >>= nInt64;
exportLong(nInt64, rName);
}
break;
case uno::TypeClass_DOUBLE:
{
- double fDouble;
+ double fDouble(0.0);
aAny >>= fDouble;
exportDouble(fDouble, rName);
}
commit 7e7e5240419b7beb45ab41ce0baad3596581062b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 2 21:47:40 2011 +0000
WaE: this dir is warning free
diff --git a/binfilter/bf_sc/source/core/src/makefile.mk b/binfilter/bf_sc/source/core/src/makefile.mk
index 0b040b9..85c2cc6 100644
--- a/binfilter/bf_sc/source/core/src/makefile.mk
+++ b/binfilter/bf_sc/source/core/src/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit 69eea19aad2fc6566bcd1ba0710d0d938901ed65
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 2 21:44:03 2011 +0000
WaE: C42665: non-virtual dtor
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx
index 071c6be..f406a4c 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/source/filter/lwpfrib.hxx
@@ -92,7 +92,7 @@ class LwpFrib
{
public:
LwpFrib(LwpPara* pPara);
- ~LwpFrib();
+ virtual ~LwpFrib();
static LwpFrib* CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt8 fribtag, sal_uInt8 editID);
virtual void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
// virtual void Parse(IXFStream* pOutputStream);
commit 478cc6529cb311e582e7c8f6e4546c3fa740bebc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 2 21:23:09 2011 +0000
WaE: clear some warnings
diff --git a/binfilter/inc/bf_sfx2/bitset.hxx b/binfilter/inc/bf_sfx2/bitset.hxx
index f17d9ac..015a1a0 100644
--- a/binfilter/inc/bf_sfx2/bitset.hxx
+++ b/binfilter/inc/bf_sfx2/bitset.hxx
@@ -117,7 +117,7 @@ inline BitSet BitSet::operator-( const BitSet& /*rSet*/ ) const
// creates the asymetric difference with a single bit
-inline BitSet BitSet::operator-( USHORT nId ) const
+inline BitSet BitSet::operator-( USHORT /*nId*/ ) const
{
return BitSet();
}
@@ -134,7 +134,7 @@ inline BitSet& BitSet::operator-=( const BitSet& /*rSet*/ )
// creates the intersection with another bitset
-inline BitSet BitSet::operator&( const BitSet& rSet ) const
+inline BitSet BitSet::operator&( const BitSet& /*rSet*/ ) const
{
return BitSet();
}
@@ -150,7 +150,7 @@ inline BitSet& BitSet::operator&=( const BitSet& /*rSet*/ )
// creates the symetric difference with another bitset
-inline BitSet BitSet::operator^( const BitSet& rSet ) const
+inline BitSet BitSet::operator^( const BitSet& /*rSet*/ ) const
{
return BitSet();
}
@@ -166,7 +166,7 @@ inline BitSet BitSet::operator^( USHORT /*nBit*/ ) const
// builds the symetric difference with another bitset
-inline BitSet& BitSet::operator^=( const BitSet& rSet )
+inline BitSet& BitSet::operator^=( const BitSet& /*rSet*/ )
{
return *this;
}
More information about the Libreoffice-commits
mailing list