diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:23:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:23:38 +0000 |
| commit | d9bcf3dc0964485020a1c5a83341486baa99d21d (patch) | |
| tree | adf4c41295b898767522451bd64d4ebd2cde4a05 /sd/source/ui/unoidl/facreg.cxx | |
| parent | 7f50d7585b2bbfabc4117f2e3b55681c34016734 (diff) | |
INTEGRATION: CWS tune03 (1.6.226); FILE MERGED
2004/08/08 12:54:18 mhu 1.6.226.1: #i29979# Added SD_DLLPUBLIC/PRIVATE (see sddllapi.h) to exported symbols/classes.
Diffstat (limited to 'sd/source/ui/unoidl/facreg.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 1f894d20de71..729a798c2103 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: facreg.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2003-09-19 08:18:02 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:23:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,18 +59,28 @@ * ************************************************************************/ -#include <string.h> - #ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> #endif +#ifndef _CPPUHELPER_FACTORY_HXX_ +#include <cppuhelper/factory.hxx> +#endif +#ifndef _UNO_LBNAMES_H_ +#include <uno/lbnames.h> +#endif + #ifndef _OSL_DIAGNOSE_H_ -#include <osl/diagnose.h> +#include "osl/diagnose.h" +#endif +#ifndef _SAL_TYPES_H_ +#include "sal/types.h" #endif -#include <cppuhelper/factory.hxx> -#include <uno/lbnames.h> +#ifndef INCLUDED_STRING_H +#include <string.h> +#define INCLUDED_STRING_H +#endif using namespace rtl; using namespace com::sun::star; @@ -96,12 +106,17 @@ extern "C" { #endif -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + const sal_Char ** ppEnvTypeName, + uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices ) +static void SAL_CALL writeInfo( + registry::XRegistryKey * pRegistryKey, + const OUString & rImplementationName, + const uno::Sequence< OUString > & rServices ) { uno::Reference< registry::XRegistryKey > xNewKey( pRegistryKey->createKey( @@ -111,7 +126,9 @@ void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& xNewKey->createKey( rServices.getConstArray()[i]); } -sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + void * pServiceManager, + void * pRegistryKey ) { if( pRegistryKey ) { @@ -132,7 +149,10 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK return sal_True; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + const sal_Char * pImplName, + void * pServiceManager, + void * pRegistryKey ) { void * pRet = 0; |