Removed some unused parameters; added SAL_UNUSED_PARAMETER.

SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC)
is used to annotate legitimately unused parameters, so that static
analysis tools can tell legitimately unused parameters from truly
unnecessary ones.  To that end, some patches for external modules
are also added, that are only applied when compiling with GCC and
add necessary __attribute__ ((unused)) in headers.

8 files changed, 16 insertions, 16 deletions

diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 73de8423589c..25b3b1132ff1 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1208,7 +1208,7 @@ HTMLSttEndPos::~HTMLSttEndPos()
 }
 
 typedef HTMLSttEndPos *HTMLSttEndPosPtr;
-SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5, 5 )
+SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5 )
 
 enum HTMLOnOffState { HTML_NOT_SUPPORTED,   // nicht unterst. Attribut
                       HTML_REAL_VALUE,      // Attribut mit Wert
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 45dfe8e683c3..e03b1d4d3f1d 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -313,7 +313,7 @@ void SwHTMLWriter::CollectFlyFrms()
             "number of browser configurations has changed" );
 
     sal_uInt8 nSz = (sal_uInt8)Min( pDoc->GetSpzFrmFmts()->Count(), sal_uInt16(255) );
-    SwPosFlyFrms aFlyPos( nSz, nSz );
+    SwPosFlyFrms aFlyPos( nSz );
     pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, sal_True );
 
     for( sal_uInt16 i=0; i< aFlyPos.Count(); i++ )
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index ff86a532dc97..5e0d945cfd92 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -129,7 +129,7 @@ public:
 };
 
 typedef SwHTMLPosFlyFrm *SwHTMLPosFlyFrmPtr;
-SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10, 10 )
+SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10 )
 
 
 #endif
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index f10de6ebc07e..ba2c5a721c05 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -41,7 +41,7 @@
 #include "wrthtml.hxx"
 
 typedef SwTxtFtn *SwTxtFtnPtr;
-SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1, 1 )
+SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1 )
 
 struct SwHTMLFootEndNote_Impl
 {
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 42eebd5225a0..2612ef575c45 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -278,7 +278,7 @@ public:
 
 // Row of a HTML table
 typedef HTMLTableCell* HTMLTableCellPtr;
-SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5,5)
+SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5)
 
 class HTMLTableRow
 {
@@ -378,12 +378,12 @@ public:
 
 // HTML table
 typedef HTMLTableRow* HTMLTableRowPtr;
-SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5,5)
+SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5)
 
 typedef HTMLTableColumn* HTMLTableColumnPtr;
-SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5,5)
+SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5)
 
-SV_DECL_PTRARR(SdrObjects,SdrObject *,1,1)
+SV_DECL_PTRARR(SdrObjects,SdrObject *,1)
 
 class HTMLTable
 {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index b559b74be3a7..887db2500490 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2589,7 +2589,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
     SwCntntNode* pCNd;
     sal_uInt16 n;
 
-    _HTMLAttrs aFields( 5, 5 );
+    _HTMLAttrs aFields( 5 );
 
     for( n = aSetAttrTab.Count(); n; )
     {
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index f751719ff423..54a6f0e3073c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -72,7 +72,7 @@ extern HTMLOptionEnum aHTMLImgVAlignTable[];
 
 class _HTMLAttr;
 typedef _HTMLAttr *_HTMLAttrPtr;
-SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5, 5 )
+SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5 )
 
 class _HTMLAttr
 {
@@ -332,16 +332,16 @@ public:
 };
 
 typedef _HTMLAttrContext *_HTMLAttrContextPtr;
-SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5, 5 )
+SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5 )
 
 class HTMLTable;
 class SwCSS1Parser;
 class SwHTMLNumRuleInfo;
 
 typedef ImageMap *ImageMapPtr;
-SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1, 1 )
+SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1 )
 typedef SwFrmFmt *SwFrmFmtPtr;
-SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2, 2 )
+SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2 )
 
 #define HTML_CNTXT_PROTECT_STACK    0x0001
 #define HTML_CNTXT_STRIP_PARA       0x0002
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 633ad33dd1b9..96e2d06ef2ec 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -189,11 +189,11 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG    =
 
 // der HTML-Writer
 struct HTMLControl;
-SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1, 1 )
-SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1, 1 )
+SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1 )
+SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1 )
 
 struct SwHTMLFmtInfo;
-SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1, 1 )
+SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1 )
 
 class IDocumentStylePoolAccess;