diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:00:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:00:55 +0000 |
| commit | b2077f4b3e5e08c07931e000babb348ff352c857 (patch) | |
| tree | 1f5ced591250f3b6d51dce1c31f17d32f4144708 /ucbhelper | |
| parent | 5823e907daa9d5046af5ae7a52193cd115d2a155 (diff) | |
INTEGRATION: CWS bgdlremove (1.4.28); FILE MERGED
2007/05/30 10:50:31 kso 1.4.28.2: #i37864# - Cleanup.
2007/05/11 12:52:28 kso 1.4.28.1: #i76911# - ucbhelper no longer uses VOS
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/workben/myucp/myucp_services.cxx | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx index ae0dc8bf9284..14be3c6ba83f 100644 --- a/ucbhelper/workben/myucp/myucp_services.cxx +++ b/ucbhelper/workben/myucp/myucp_services.cxx @@ -4,9 +4,9 @@ * * $RCSfile: myucp_services.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:26:30 $ + * last change: $Author: ihi $ $Date: 2007-06-05 15:00:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,27 +36,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucbhelper.hxx" -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ -#include <com/sun/star/registry/XRegistryKey.hpp> -#endif - -// @@@ Adjust multi-include-protection-ifdef and header file name. -#ifndef _MYUCP_PROVIDER_HXX +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" + #include "myucp_provider.hxx" -#endif using namespace com::sun::star; +namespace { + //========================================================================= -static sal_Bool writeInfo( void * pRegistryKey, - const rtl::OUString & rImplementationName, - uno::Sequence< rtl::OUString > const & rServiceNames ) +sal_Bool writeInfo( void * pRegistryKey, + const rtl::OUString & rImplementationName, + uno::Sequence< rtl::OUString > const & rServiceNames ) { rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); aKeyName += rImplementationName; @@ -92,16 +85,18 @@ static sal_Bool writeInfo( void * pRegistryKey, return bSuccess; } +} + //========================================================================= extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= extern "C" sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) + void * /*pServiceManager*/, void * pRegistryKey ) { return pRegistryKey && @@ -117,7 +112,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( //========================================================================= extern "C" void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; |