summaryrefslogtreecommitdiff
path: root/comphelper/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-21 15:21:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-21 15:21:16 +0100
commit7c704c78d3c652504c064b4ac7af55a2c1ee49bb (patch)
tree623358cf25839219ef4fd90eea4f3eaa55389a1f /comphelper/inc
parent0d5167915b47df7c3e450614ea50d845ba959df3 (diff)
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.
Diffstat (limited to 'comphelper/inc')
-rw-r--r--comphelper/inc/comphelper/componentmodule.hxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 5893313c8497..8397e7c5fce7 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -31,7 +31,6 @@
#include <comphelper/comphelperdllapi.h>
/** === begin UNO includes === **/
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/Sequence.hxx>
/** === end UNO includes === **/
@@ -141,23 +140,17 @@ namespace comphelper
/** creates a Factory for the component with the given implementation name.
<p>Usually used from within component_getFactory.<p/>
- @param _rxServiceManager
- a pointer to an XMultiServiceFactory interface as got in component_getFactory
@param _pImplementationName
the implementation name of the component
@return
the XInterface access to a factory for the component
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
- const ::rtl::OUString& _rImplementationName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager
- );
+ const ::rtl::OUString& _rImplementationName );
- /** version of getComponentFactory which directly takes the arguments you got in your component_getFactory call
+ /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call
*/
- void* getComponentFactory(
- const sal_Char* _pImplementationName, void* _pServiceManager, void* _pRegistryKey
- );
+ void* getComponentFactory( const sal_Char* _pImplementationName );
public:
class ClientAccess { friend class OModuleClient; private: ClientAccess() { } };