[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/filter filter/inc filter/source hwpfilter/source unoxml/source writerperfect/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Wed Apr 20 13:57:37 PDT 2011
binfilter/bf_forms/source/misc/forms_services.cxx | 4 -
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 4 -
binfilter/bf_sch/source/ui/unoidl/sch_register.cxx | 4 -
binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx | 4 -
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 2
binfilter/bf_starmath/source/starmath_register.cxx | 4 -
binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx | 4 -
binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx | 4 -
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx | 4 -
binfilter/binfilterdetect/source/bindetect.cxx | 4 -
binfilter/filter/source/bf_migrate/bf_migrateexports.cxx | 4 -
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx | 4 -
filter/inc/registration.hxx | 4 -
filter/source/filtertracer/filtertraceruno.cxx | 4 -
filter/source/msfilter/powerpoint/pptimporteruno.cxx | 4 -
filter/source/placeware/uno.cxx | 4 -
filter/source/t602/filterenv.cxx | 4 -
filter/source/xmlfilteradaptor/genericfilter.cxx | 4 -
filter/source/xmlfilterdetect/fdcomp.cxx | 53 ---------------
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 4 -
filter/source/xsltfilter/XSLTFilter.cxx | 6 -
hwpfilter/source/hwpreader.hxx | 4 -
unoxml/source/rdf/librdf_services.cxx | 6 -
unoxml/source/service/services.cxx | 6 -
writerperfect/source/wpdimp/wpft_genericfilter.cxx | 4 -
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 4 -
writerperfect/source/wpsimp/msworks_genericfilter.cxx | 4 -
27 files changed, 53 insertions(+), 108 deletions(-)
New commits:
commit 1bd128b9897a6f6e49eb90f9ac01250b62b2edae
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Apr 20 21:03:55 2011 +0200
Easyhack: Add visibility markup to all component_get* functions
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index 000b805..253b535 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -477,13 +477,13 @@ void SAL_CALL createRegistryInfo_FORMS()
}
//---------------------------------------------------------------------------------------
-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 component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
if (!_pServiceManager || !_pImplName)
return NULL;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index a81dad3..897808f 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -160,13 +160,13 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
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*/ )
{
if (!pServiceManager)
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
index e5efd10..3531a6f 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
@@ -41,13 +41,13 @@ extern uno::Reference< uno::XInterface > SAL_CALL SchDocument_createInstance(con
extern "C" {
-void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
void* /*pRegistryKey*/ )
{
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
index 648c8f2..f5640ca 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
@@ -52,12 +52,12 @@ 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 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;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index bd1c9aa..2f301e6 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -887,7 +887,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
extern "C" {
/*N*/
-/*N*/ void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
+/*N*/ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
/*N*/ void* pServiceManager ,
/*N*/ void* /*pRegistryKey*/ )
/*N*/ {
diff --git a/binfilter/bf_starmath/source/starmath_register.cxx b/binfilter/bf_starmath/source/starmath_register.cxx
index 77faefc..984fcba 100644
--- a/binfilter/bf_starmath/source/starmath_register.cxx
+++ b/binfilter/bf_starmath/source/starmath_register.cxx
@@ -98,14 +98,14 @@ extern Reference< XInterface > SAL_CALL
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
index d2c2de0..d40284c 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
@@ -224,7 +224,7 @@ void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
extern "C"
{
-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;
}
@@ -239,7 +239,7 @@ void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString&
xNewKey->createKey( rServices.getConstArray()[i]);
}
-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;
if( pServiceManager )
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
index 8c79821..0f8d5e4 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
@@ -99,14 +99,14 @@ extern "C"
{
#endif
-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( const sal_Char * pImplName,
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName,
void * pServiceManager,
void * /*pRegistryKey*/ )
{
diff --git a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
index 101afe1..6f30b0c 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
@@ -212,12 +212,12 @@ 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 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;
if( pServiceManager )
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx b/binfilter/binfilterdetect/source/bindetect.cxx
index 85ac323..d0e6550 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -747,13 +747,13 @@ UNOREFERENCE< UNOXINTERFACE > SAL_CALL BinFilterDetect::impl_createInstance( con
}
extern "C" {
-void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
void* /*pRegistryKey*/ )
{
diff --git a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
index c60b263..5a58611 100644
--- a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
@@ -48,14 +48,14 @@ extern "C"
{
//==================================================================================================
-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 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;
diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index 48aed64..b41ee38 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -190,14 +190,14 @@ void SAL_CALL bf_OfficeWrapper::removeEventListener( const Reference< XEventList
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/)
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx
index 8c46eaa..7bfe0d5 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 2d785c3..db96e0d 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 f0cc68e..f7ff058 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 df80259..2e063db 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 62c4502..e330954 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 7c71809..12c3e7c 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 8609642..611d236 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 4a8e927..aba29a7 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 a62f048..1757ca2 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 0cd0118..12b6794 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 3d202af..b005b27 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 1269875..14560e1 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 c7080f7..8c2caa3 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 2ab4fae..c453a9c 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 8b37d45..2213c0c 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;
More information about the Libreoffice-commits
mailing list