diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:16:04 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 11:16:04 +0000 |
commit | 36f6db6fc9ac846d132f2ff9852760398ab67f57 (patch) | |
tree | 9a8ec66b741fc447469aadfa985bc271a5277663 /comphelper | |
parent | 67e438c4137e4c8d7c21dfcf9d452f7196e5d591 (diff) |
INTEGRATION: CWS canvas05 (1.4.78); FILE MERGED
2008/04/21 07:56:04 thb 1.4.78.2: RESYNC: (1.4-1.5); FILE MERGED
2007/10/01 13:50:39 thb 1.4.78.1: #i80285# Merge from CWS picom
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/inc/comphelper/servicedecl.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index 2b9fca7bc730..aadd65ee77cc 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: servicedecl.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -392,16 +392,16 @@ extern "C" \ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \ } \ \ - sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory* pServiceManager, \ - registry::XRegistryKey* pRegistryKey ) \ + sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \ + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) \ { \ return component_writeInfoHelper( pServiceManager, pRegistryKey, \ BOOST_PP_SEQ_ENUM(varargs_) ); \ } \ \ - void* SAL_CALL component_getFactory( sal_Char const* pImplName, \ - lang::XMultiServiceFactory* pServiceManager, \ - registry::XRegistryKey* pRegistryKey ) \ + void* SAL_CALL component_getFactory( sal_Char const* pImplName, \ + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \ + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) \ { \ return component_getFactoryHelper( pImplName, pServiceManager, \ pRegistryKey, \ |