diff options
44 files changed, 105 insertions, 56 deletions
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index 77f053dcb305..7a817eaf3ad3 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -81,6 +81,14 @@ namespace cairocanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS2(cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl) +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component index 126ad2b44ee1..b21197d0e4e8 100644 --- a/canvas/source/cairo/cairocanvas.component +++ b/canvas/source/cairo/cairocanvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="cairocanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.Canvas.Cairo"> <service name="com.sun.star.rendering.Canvas.Cairo"/> diff --git a/canvas/source/directx/directx5canvas.component b/canvas/source/directx/directx5canvas.component index 80133e724df6..f7bcdbffe517 100644 --- a/canvas/source/directx/directx5canvas.component +++ b/canvas/source/directx/directx5canvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="directx5canvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX5"> <service name="com.sun.star.rendering.SpriteCanvas.DX5"/> diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component index 0d395892d4cb..dc0349bfbf96 100644 --- a/canvas/source/directx/directx9canvas.component +++ b/canvas/source/directx/directx9canvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="directx9canvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX9"> <service name="com.sun.star.rendering.SpriteCanvas.DX9"/> diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index c29319b3974e..18d894035560 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -252,7 +252,14 @@ namespace dxcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS2(dxcanvas::dxCanvasDecl, - dxcanvas::dxBitmapCanvasDecl); +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxCanvasDecl, dxcanvas::dxBitmapCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 430f4639cb92..6c4739203caa 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -209,6 +209,14 @@ namespace dxcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(dxcanvas::dxSpriteCanvasDecl); +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxSpriteCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component index e39e77444d59..8845e8c6dfc2 100644 --- a/canvas/source/directx/gdipluscanvas.component +++ b/canvas/source/directx/gdipluscanvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="gdipluscanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.BitmapCanvas.GDI+"> <service name="com.sun.star.rendering.BitmapCanvas.GDI+"/> diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index 3896f4197d2f..d8bdd526346b 100644 --- a/canvas/source/factory/canvasfactory.component +++ b/canvas/source/factory/canvasfactory.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="canvasfactory" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.CanvasFactory"> <service name="com.sun.star.rendering.CanvasFactory"/> diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 316c4b7aecff..7b8e876e7c00 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -527,7 +527,7 @@ const ::cppu::ImplementationEntry s_entries [] = { extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL canvasfactory_component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx index 509e3656f8fa..794b692d4a65 100644 --- a/canvas/source/null/null_spritecanvas.cxx +++ b/canvas/source/null/null_spritecanvas.cxx @@ -164,6 +164,14 @@ namespace nullcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(nullcanvas::nullCanvasDecl) +extern "C" +{ +SAL_DLLPUBLIC_EXPORT 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, nullcanvas::nullCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/simplecanvas/simplecanvas.component b/canvas/source/simplecanvas/simplecanvas.component index 3a00b407375e..ef290927a679 100644 --- a/canvas/source/simplecanvas/simplecanvas.component +++ b/canvas/source/simplecanvas/simplecanvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="simplecanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SimpleCanvas"> <service name="com.sun.star.rendering.SimpleCanvas"/> diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index f41ee45269f2..ea61bb49f703 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -398,6 +398,14 @@ namespace } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(simpleCanvasDecl) +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL simplecanvas_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, simpleCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index f482c841ea74..2755f81acdfe 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -88,6 +88,14 @@ namespace vclcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS2(vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl) +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL vclcanvas_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/vclcanvas.component b/canvas/source/vcl/vclcanvas.component index f7e0bb8c0266..eb1246706a4d 100644 --- a/canvas/source/vcl/vclcanvas.component +++ b/canvas/source/vcl/vclcanvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="vclcanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.Canvas.VCL"> <service name="com.sun.star.rendering.Canvas.VCL"/> diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index ad5558fb8ee7..27d06f4df84b 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -85,7 +85,7 @@ namespace comphelper { namespace module } } // namespace comphelper::module //........................................................................ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL comphelp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) { ::comphelper::module::initializeModule(); diff --git a/comphelper/util/comphelp.component b/comphelper/util/comphelp.component index 10d23d48bcea..d29468bfe459 100644 --- a/comphelper/util/comphelp.component +++ b/comphelper/util/comphelp.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="comphelp" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="AnyCompareFactory"> <service name="com.sun.star.ucb.AnyCompareFactory"/> diff --git a/cppcanvas/source/uno/mtfrenderer.component b/cppcanvas/source/uno/mtfrenderer.component index 32284e46cd74..68bf37e1b933 100644 --- a/cppcanvas/source/uno/mtfrenderer.component +++ b/cppcanvas/source/uno/mtfrenderer.component @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="mtfrenderer" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.MtfRenderer"> <service name="com.sun.star.rendering.MtfRenderer"/> diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx index 2c525140c1da..596b5e7c82b4 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.cxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx @@ -78,6 +78,14 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.rendering.MtfRenderer" ); // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(MtfRendererDecl) +extern "C" +{ +SAL_DLLPUBLIC_EXPORT void* SAL_CALL mtfrenderer_component_getFactory( sal_Char const* pImplName, + ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, + ::com::sun::star::registry::XRegistryKey* pRegistryKey ) +{ + return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, MtfRendererDecl ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 6b09a8e69ce6..fa7950cd016b 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -90,7 +90,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/generic/dtrans.component b/dtrans/source/generic/dtrans.component index 69034f716907..ed4d38167d59 100644 --- a/dtrans/source/generic/dtrans.component +++ b/dtrans/source/generic/dtrans.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="dtrans" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.datatransfer.ClipboardManager"> <service name="com.sun.star.datatransfer.clipboard.ClipboardManager"/> diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index c9295644ea80..fc2705d311e4 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -46,7 +46,7 @@ extern "C" //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL dtrans_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index 5c61e6c3557f..31734f685aa6 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -88,7 +88,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index e7b56fcc5cf7..78833685ee7c 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -58,17 +58,8 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic extern "C" { -sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) -{ - return g_moduleCount.canUnload( &g_moduleCount , pTime ); -} - -//---------------------------------------------------------------------- -// component_getFactory -// returns a factory to create XFilePicker-Services -//---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; Reference< XSingleServiceFactory > xFactory; diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index e519b5361102..a47f5779223d 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -91,7 +91,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/util/dnd.component b/dtrans/util/dnd.component index b56fe326f04f..8318f8a69aac 100644 --- a/dtrans/util/dnd.component +++ b/dtrans/util/dnd.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="dnd" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"> <service name="com.sun.star.datatransfer.dnd.OleDragSource"/> diff --git a/dtrans/util/ftransl.component b/dtrans/util/ftransl.component index dad7d341cce7..db68f788453e 100644 --- a/dtrans/util/ftransl.component +++ b/dtrans/util/ftransl.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="ftransl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.datatransfer.DataFormatTranslator"> <service name="com.sun.star.datatransfer.DataFormatTranslator"/> diff --git a/dtrans/util/mcnttype.component b/dtrans/util/mcnttype.component index f5a937a7a77a..60e57c3dff8d 100644 --- a/dtrans/util/mcnttype.component +++ b/dtrans/util/mcnttype.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="mcnttype" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.datatransfer.MimeCntTypeFactory"> <service name="com.sun.star.datatransfer.MimeContentTypeFactory"/> diff --git a/dtrans/util/sysdtrans.component b/dtrans/util/sysdtrans.component index ec1807000b3f..6f95f394be29 100644 --- a/dtrans/util/sysdtrans.component +++ b/dtrans/util/sysdtrans.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="sysdtrans" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.datatransfer.clipboard.ClipboardW32"> <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/> diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index f12c380011d8..6dd24feba5fc 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -57,7 +57,7 @@ #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ { \ ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_getFactory():" ); \ + sOut.append( "fw?_component_getFactory():" ); \ sOut.append( SINFOTEXT ); \ WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ } diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 94815f726b75..e4a3b785df13 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -57,7 +57,7 @@ Please use follow public macros only! IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() + COMPONENTGETFACTORY( LIB, IFFACTORIES ) => use it to define exported function LIB_component_getFactory() _________________________________________________________________________________________________________________*/ @@ -80,8 +80,8 @@ ________________________________________________________________________________ // public // define method to instanciate new services //***************************************************************************************************************** -#define COMPONENTGETFACTORY( IFFACTORIES ) \ - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , \ +#define COMPONENTGETFACTORY( LIB, IFFACTORIES ) \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory( const sal_Char* pImplementationName, \ void* pServiceManager , \ void* /*pRegistryKey*/ ) \ { \ diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index a045ea7cba0f..5a88f13ecd78 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -56,7 +56,8 @@ #include <dispatch/systemexec.hxx> #include <jobs/shelljob.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else +COMPONENTGETFACTORY ( fwm, + IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::TabWinFactory ) else IFFACTORY( ::framework::SystemExec ) else IFFACTORY( ::framework::ShellJob ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 54695d733e0c..c271433f1878 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -89,7 +89,8 @@ #include <services/substitutepathvars.hxx> #include <services/pathsettings.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else +COMPONENTGETFACTORY ( fwk, + IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else IFFACTORY( ::framework::JobExecutor ) else diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index b420fdfe02cd..e331701f86b3 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -74,7 +74,8 @@ #include <uielement/toolbarsmenucontroller.hxx> #include <uielement/popupmenucontroller.hxx> -COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) +COMPONENTGETFACTORY ( fwl, + IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::LogoTextStatusbarController ) else diff --git a/framework/util/fwk.component b/framework/util/fwk.component index c460ecbccd70..0e206d1f7ae0 100755 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwk" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.frame.SessionListener"> <service name="com.sun.star.frame.SessionListener"/> diff --git a/framework/util/fwl.component b/framework/util/fwl.component index 99c5ca7213e6..5fca040b2b4a 100755 --- a/framework/util/fwl.component +++ b/framework/util/fwl.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController"> <service name="com.sun.star.frame.PopupMenuController"/> diff --git a/framework/util/fwm.component b/framework/util/fwm.component index 624249ff4382..8b2c4e653844 100755 --- a/framework/util/fwm.component +++ b/framework/util/fwm.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fwm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.framework.HelpOnStartup"> <service name="com.sun.star.task.Job"/> diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 5df7bb931b7c..cfccbcdb2837 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -576,7 +576,7 @@ static const struct InstancesArray { extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ ) { void* pRet = NULL; diff --git a/i18npool/source/search/i18nsearch.component b/i18npool/source/search/i18nsearch.component index 6288bcd7c840..581cbff9520a 100644 --- a/i18npool/source/search/i18nsearch.component +++ b/i18npool/source/search/i18nsearch.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="i18nsearch" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.util.TextSearch_i18n"> <service name="com.sun.star.util.TextSearch"/> diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index f407a614ed1f..a6ab4cc51dad 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -982,7 +982,7 @@ SAL_CALL TextSearch_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, +SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18nsearch_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ ) { void* pRet = NULL; diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component index d11606efb6d4..4c5e6d7a51bb 100644 --- a/i18npool/util/i18npool.component +++ b/i18npool/util/i18npool.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="i18npool" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.i18n.BreakIterator"> <service name="com.sun.star.i18n.BreakIterator"/> diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component index 5e6699d9dd33..b697bf232e6a 100644 --- a/sax/source/expatwrap/expwrap.component +++ b/sax/source/expatwrap/expwrap.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="expwrap" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.extensions.xml.sax.ParserExpat"> <service name="com.sun.star.xml.sax.Parser"/> diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 34df91a83a26..8587e2843fad 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -1029,7 +1029,7 @@ using namespace sax_expatwrap; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx index 8352b0cf4824..bc27b2e0b614 100644 --- a/sax/source/fastparser/facreg.cxx +++ b/sax/source/fastparser/facreg.cxx @@ -35,7 +35,7 @@ Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Referen extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/fastparser/fastsax.component b/sax/source/fastparser/fastsax.component index a184a76d2d83..c721daaccb7f 100644 --- a/sax/source/fastparser/fastsax.component +++ b/sax/source/fastparser/fastsax.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fastsax" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.extensions.xml.sax.FastParser"> <service name="com.sun.star.xml.sax.FastParser"/> |