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, 8 insertions, 8 deletions

diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 2042c7ee3168..b97c91090385 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::lang;
 using ::rtl::OUString;
 
 typedef Mapping* MappingPtr;
-SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2)
+SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2)
 SV_IMPL_PTRARR(MappingArray, MappingPtr);
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 5cd7e9d46471..4dd6aefb4703 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -58,7 +58,7 @@ public:
 };
 
 typedef BibStatusDispatch* BibStatusDispatchPtr;
-SV_DECL_PTRARR_DEL( BibStatusDispatchArr, BibStatusDispatchPtr, 4, 4 )
+SV_DECL_PTRARR_DEL( BibStatusDispatchArr, BibStatusDispatchPtr, 4 )
 
 class BibFrameController_Impl : public cppu::WeakImplHelper5 <
     ::com::sun::star::lang::XServiceInfo,
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index ad6f05072309..be2e95c09c8d 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -111,7 +111,7 @@ public:
 
 
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener>* BibToolBarListenerPtr;
-SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4, 4 )
+SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4 )
 
 class BibToolBar:   public ToolBox
 {
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index d244ac79c4f6..46dd19c0b85e 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -58,10 +58,11 @@ namespace logging
 //........................................................................
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
-    const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
+    const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
+    SAL_UNUSED_PARAMETER void* )
 {
     ::logging::initializeModule();
-    return ::logging::LogModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey );
+    return ::logging::LogModule::getInstance().getComponentFactory( pImplementationName );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index ad8ebb1bf7cc..ffde3d828451 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -92,7 +92,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
-                    void* /*pRegistryKey*/)
+                    SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
 {
     pcr_initializeModule();
 
@@ -100,8 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     if (pServiceManager && pImplementationName)
     {
         xRet = ::pcr::PcrModule::getInstance().getComponentFactory(
-            ::rtl::OUString::createFromAscii(pImplementationName),
-            static_cast< XMultiServiceFactory* >(pServiceManager));
+            ::rtl::OUString::createFromAscii(pImplementationName));
     }
 
     if (xRet.is())