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

diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 55fb7cd5af43..105adae891c6 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -78,9 +78,9 @@ extern "C"
 {
 
 //------------------------------------------------------------------------------
-static void SAL_CALL ExceptionThrower_acquire_release_nop( uno_Interface * )
-{
-}
+static void SAL_CALL ExceptionThrower_acquire_release_nop(
+    SAL_UNUSED_PARAMETER uno_Interface * )
+{}
 
 //------------------------------------------------------------------------------
 static void SAL_CALL ExceptionThrower_dispatch(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index cab323a17d4b..4a298d1cb188 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -956,9 +956,7 @@ class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleService
 
 public:
 
-    OFactoryProxyHelper(
-        const Reference<XMultiServiceFactory > & /*rServiceManager*/,
-        const Reference<XSingleServiceFactory > & rFactory )
+    OFactoryProxyHelper( const Reference<XSingleServiceFactory > & rFactory )
         SAL_THROW( () )
         : xFactory( rFactory )
         {}
@@ -1053,12 +1051,11 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
 
 // global function
 Reference<XSingleServiceFactory > SAL_CALL createFactoryProxy(
-    const Reference<XMultiServiceFactory > & rServiceManager,
+    SAL_UNUSED_PARAMETER const Reference<XMultiServiceFactory > &,
     const Reference<XSingleServiceFactory > & rFactory )
     SAL_THROW( () )
 {
-    return new OFactoryProxyHelper(
-        rServiceManager, rFactory );
+    return new OFactoryProxyHelper( rFactory );
 }
 
 // global function
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index 4aa41501e9dd..bd617b8c9f2c 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -37,7 +37,8 @@ using namespace ::com::sun::star::registry;
 namespace cppu {
 
 sal_Bool component_writeInfoHelper(
-    void *, void *pRegistryKey , const struct ImplementationEntry entries[] )
+    SAL_UNUSED_PARAMETER void *, void * pRegistryKey,
+    ImplementationEntry const * entries)
 {
     sal_Bool bRet = sal_False;
     try
@@ -70,8 +71,8 @@ sal_Bool component_writeInfoHelper(
 
 
 void * component_getFactoryHelper(
-    const sal_Char * pImplName, void *, void *,
-    const struct ImplementationEntry entries[] )
+    char const * pImplName, SAL_UNUSED_PARAMETER void *,
+    SAL_UNUSED_PARAMETER void *, ImplementationEntry const * entries)
 {
 
       void * pRet = 0;
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 35322327d169..431e24c76c01 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -111,7 +111,7 @@ protected:
     virtual void SAL_CALL disposing();
 
 public:
-    inline Bootstrap_MacroExpander( Reference< XComponentContext > const & ) SAL_THROW( () )
+    inline Bootstrap_MacroExpander() SAL_THROW( () )
         : t_uno_impl( m_mutex )
         {}
     virtual ~Bootstrap_MacroExpander()
@@ -173,10 +173,10 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
 
 //==================================================================================================
 Reference< XInterface > SAL_CALL service_create(
-    Reference< XComponentContext > const & xComponentContext )
+    SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
     SAL_THROW( (RuntimeException) )
 {
-    return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander( xComponentContext ) );
+    return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander );
 }
 
 }
diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx
index 8bb197eed1ad..e42d83bebe97 100644
--- a/cppuhelper/source/stdidlclass.cxx
+++ b/cppuhelper/source/stdidlclass.cxx
@@ -29,20 +29,22 @@
 #include "sal/config.h"
 
 #include "cppuhelper/stdidlclass.hxx"
-#include "osl/diagnose.h"
+#include "sal/log.hxx"
+#include "sal/types.h"
 
 namespace cppu {
 
 com::sun::star::reflection::XIdlClass * createStandardClassWithSequence(
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        const &,
-    rtl::OUString const &,
-    com::sun::star::uno::Reference< com::sun::star::reflection::XIdlClass >
-        const &,
-    com::sun::star::uno::Sequence< rtl::OUString > const &) SAL_THROW(())
+    SAL_UNUSED_PARAMETER com::sun::star::uno::Reference<
+        com::sun::star::lang::XMultiServiceFactory > const &,
+    SAL_UNUSED_PARAMETER rtl::OUString const &,
+    SAL_UNUSED_PARAMETER com::sun::star::uno::Reference<
+        com::sun::star::reflection::XIdlClass > const &,
+    SAL_UNUSED_PARAMETER com::sun::star::uno::Sequence< rtl::OUString > const &)
+    SAL_THROW(())
 {
-    OSL_TRACE(
-        OSL_LOG_PREFIX
+    SAL_INFO(
+        "cppuhelper",
         "deprecated/defunct cppu::createStandardClassWithSequence called");
     return 0;
 }