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.

5 files changed, 7 insertions, 7 deletions

diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index ffa8bf55f157..e5d284405cc1 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -64,7 +64,7 @@ struct SearchAttrItem
 
 // class SearchAttrItemList ----------------------------------------------
 
-SV_DECL_VARARR_VISIBILITY(SrchAttrItemList, SearchAttrItem, 8, 8, SVX_DLLPUBLIC)
+SV_DECL_VARARR_VISIBILITY(SrchAttrItemList, SearchAttrItem, 8, SVX_DLLPUBLIC)
 
 class SVX_DLLPUBLIC SearchAttrItemList : private SrchAttrItemList
 {
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 4e733d52f307..fb2c0991d37b 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -229,7 +229,7 @@ public:
 // FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er bestimmte Eintraege selektieren soll
 
 typedef FmEntryData* FmEntryDataPtr;
-SV_DECL_PTRARR_SORT( FmEntryDataArray, FmEntryDataPtr, 16, 16 )
+SV_DECL_PTRARR_SORT( FmEntryDataArray, FmEntryDataPtr, 16 )
 
 class FmNavRequestSelectHint : public SfxHint
 {
@@ -420,7 +420,7 @@ namespace svxform
 
     //========================================================================
     typedef SvLBoxEntry* SvLBoxEntryPtr;
-    SV_DECL_PTRARR_SORT( SvLBoxEntrySortedArray, SvLBoxEntryPtr, 16, 16 )
+    SV_DECL_PTRARR_SORT( SvLBoxEntrySortedArray, SvLBoxEntryPtr, 16 )
 
     class NavigatorTree : public SvTreeListBox, public SfxListener
     {
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 152997a60893..e2313e23d14f 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -75,7 +75,7 @@
 #include <set>
 #include <vector>
 
-SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32, 16)
+SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32)
 //  SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>, 32, 16);
 DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray);
 
@@ -584,7 +584,7 @@ public:
 };
 
 // ========================================================================
-SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16, 0)
+SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16)
 class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
 {
 protected:
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index cc2dfe34cc99..485c5f5e6158 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -241,7 +241,7 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
 
     if( pIStm )
     {
-        pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet, (sal_uInt16)pIStm->GetVersion()));
+        pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet));
 
         char cRTF[5];
         cRTF[4] = 0;
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 619af8bf3186..68f45bb7e430 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -177,7 +177,7 @@ Reference< XMultiServiceFactory > createApplicationServiceManager()
 
 // --- class EditApp -------------------------------------------------
 
-SV_DECL_PTRARR_DEL( StringList, String*, 0, 4 );
+SV_DECL_PTRARR_DEL( StringList, String*, 0 );
 SV_IMPL_PTRARR( StringList, String* );
 StringList aSimpleHistory;