diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2011-04-20 21:03:55 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2011-04-20 21:05:01 +0200 |
commit | 7c4fbccee7b3776242d21c5980ce671b162821b0 (patch) | |
tree | 1c90a05c4ad07f5fa3ae8b8dad25d459ebf9a534 | |
parent | make sure that library in services.rdb is correct for writerfilter services (diff) | |
download | core-7c4fbccee7b3776242d21c5980ce671b162821b0.tar.gz core-7c4fbccee7b3776242d21c5980ce671b162821b0.zip |
Easyhack: Add visibility markup to all component_get* functions
-rw-r--r-- | filter/inc/registration.hxx | 4 | ||||
-rw-r--r-- | filter/source/filtertracer/filtertraceruno.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/powerpoint/pptimporteruno.cxx | 4 | ||||
-rw-r--r-- | filter/source/placeware/uno.cxx | 4 | ||||
-rw-r--r-- | filter/source/t602/filterenv.cxx | 4 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/genericfilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/xmlfilterdetect/fdcomp.cxx | 53 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 6 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.hxx | 4 | ||||
-rw-r--r-- | unoxml/source/rdf/librdf_services.cxx | 6 | ||||
-rw-r--r-- | unoxml/source/service/services.cxx | 6 | ||||
-rw-r--r-- | writerperfect/source/wpdimp/wpft_genericfilter.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/wpsimp/msworks_genericfilter.cxx | 4 |
15 files changed, 30 insertions, 85 deletions
diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx index 8c46eaa52b35..7bfe0d538b2a 100644 --- a/filter/inc/registration.hxx +++ b/filter/inc/registration.hxx @@ -50,7 +50,7 @@ namespace comphelper{ /** TODO doc */ #define _COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT \ - extern "C" void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvironmentTypeName, \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvironmentTypeName, \ uno_Environment** /* ppEnvironment */ ) \ { \ *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \ @@ -83,7 +83,7 @@ namespace comphelper{ /** TODO doc */ #define _COMPHELPER_COMPONENT_GETFACTORY(STATIC_INIT,FACTORYLIST) \ - extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, \ void* pServiceManager , \ void* /* pRegistryKey */ ) \ { \ diff --git a/filter/source/filtertracer/filtertraceruno.cxx b/filter/source/filtertracer/filtertraceruno.cxx index bcde78fc8e8e..9cc865c889d6 100644 --- a/filter/source/filtertracer/filtertraceruno.cxx +++ b/filter/source/filtertracer/filtertraceruno.cxx @@ -47,7 +47,7 @@ static REF( NMSP_UNO::XInterface ) SAL_CALL create_FilterTracer( const REF( NMSP // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -56,7 +56,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { REF( NMSP_LANG::XSingleServiceFactory ) xFactory; void* pRet = 0; diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx index 3725382026f7..0cf1998d15f2 100644 --- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx +++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx @@ -39,12 +39,12 @@ static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_ return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) ); } -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { REF( NMSP_LANG::XSingleServiceFactory ) xFactory; void* pRet = 0; diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx index f8f1298b5283..49a5c599c1eb 100644 --- a/filter/source/placeware/uno.cxx +++ b/filter/source/placeware/uno.cxx @@ -54,13 +54,13 @@ using namespace ::pwp; extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index ab59b32f0463..5202c38c3c91 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -47,13 +47,13 @@ using namespace T602ImportFilter; extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index 48776a09ac8d..67d364c608e0 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -48,13 +48,13 @@ using namespace ::com::sun::star::registry; extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx index 5d172bdf534a..43d80512b9dc 100644 --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ b/filter/source/xmlfilterdetect/fdcomp.cxx @@ -28,103 +28,54 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_filter.hxx" - #include <stdio.h> - - #include <osl/mutex.hxx> - #include <osl/thread.h> - #include <cppuhelper/factory.hxx> - - #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ - #include <com/sun/star/lang/XSingleServiceFactory.hpp> - #endif - - #include "filterdetect.hxx" - - using namespace ::rtl; - using namespace ::cppu; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::registry; - - extern "C" - { - //================================================================================================== - -void SAL_CALL component_getImplementationEnvironment( - +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - //================================================================================================== - -void * SAL_CALL component_getFactory( - +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) - { - void * pRet = 0; - - - OUString implName = OUString::createFromAscii( pImplName ); - if ( pServiceManager && implName.equals(FilterDetect_getImplementationName()) ) - { - Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString::createFromAscii( pImplName ), - FilterDetect_createInstance, FilterDetect_getSupportedServiceNames() ) ); - - if (xFactory.is()) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - } return pRet; } - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 73fe2028b043..df5dde22dd1f 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -399,14 +399,14 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index e4ded85b4f2a..0bf8c1771a3e 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -644,15 +644,13 @@ using namespace XSLT; extern "C" { - void SAL_CALL - component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * - SAL_CALL component_getFactory(const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */) { void * pRet = 0; diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index b0bbe416e5ad..37e57d42f7f3 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -340,13 +340,13 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames( void ) throw(::co extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx index 62201475cee3..03b2b1e39eec 100644 --- a/unoxml/source/rdf/librdf_services.cxx +++ b/unoxml/source/rdf/librdf_services.cxx @@ -39,8 +39,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName, +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName, uno_Environment ** /* ppEnvironment */) { *o_ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -66,8 +65,7 @@ static ::cppu::ImplementationEntry const entries[] = { { 0, 0, 0, 0, 0, 0 } }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL -component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const char * implName, void * serviceManager, void * registryKey) { return ::cppu::component_getFactoryHelper( diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx index 44c988ede39b..b81c363931fa 100644 --- a/unoxml/source/service/services.cxx +++ b/unoxml/source/service/services.cxx @@ -55,14 +55,12 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SAL_DLLPUBLIC_EXPORT void* SAL_CALL -component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/) { void* pReturn = NULL ; if ( pImplementationName && pServiceManager ) diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx index 6e184333eecd..947c27f155a7 100644 --- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx +++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx @@ -41,13 +41,13 @@ using namespace ::com::sun::star::registry; extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx index 2ab4fae56327..c453a9c10dc9 100644 --- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx +++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx @@ -41,12 +41,12 @@ using namespace ::com::sun::star::registry; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx index 8b37d45970c6..2213c0c52f8b 100644 --- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx +++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx @@ -41,12 +41,12 @@ using namespace ::com::sun::star::registry; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; |