update component factory methods to use new prefixes, to add lib merging

sot/source/unoolestorage/register.cxx

@@ -41,12 +41,12 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL sot_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL sot_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
 

sot/util/sot.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sot"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.OLESimpleStorage">
     <service name="com.sun.star.embed.OLESimpleStorage"/>

svl/source/fsstor/fsfactory.cxx

@@ -235,13 +235,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::getSupportedServiceN
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL fsstorage_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fsstorage_component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
     void * pResult = 0;

svl/source/fsstor/fsstorage.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fsstorage"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.FileSystemStorageFactory">
     <service name="com.sun.star.comp.embed.FileSystemStorageFactory"/>

svl/source/passwordcontainer/passwordcontainer.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="passwordcontainer"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="stardiv.svl.PasswordContainer">
     <service name="com.sun.star.task.PasswordContainer"/>

svl/source/passwordcontainer/passwordcontainer.cxx

@@ -1538,13 +1538,13 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL passwordcontainer_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL passwordcontainer_component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
     void * pResult = 0;

svl/source/uno/registerservices.cxx

@@ -55,13 +55,13 @@ DECLARE_CREATEINSTANCE( PathService )
 extern "C"
 {
 
-SVL_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment (
+SVL_DLLPUBLIC void SAL_CALL svl_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
+SVL_DLLPUBLIC void* SAL_CALL svl_component_getFactory (
     const sal_Char * pImplementationName, void * _pServiceManager, void * /* _pRegistryKey*/)
 {
     void * pResult = 0;

svl/util/svl.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.svl.PathService">
     <service name="com.sun.star.config.SpecialConfigManager"/>

svtools/source/hatchwindow/hatchwindowfactory.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="hatchwindowfactory"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.embed.DocumentCloser">
     <service name="com.sun.star.embed.DocumentCloser"/>

svtools/source/hatchwindow/hatchwindowfactory.cxx

@@ -109,13 +109,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::getSupportedServi
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL hatchwindowfactory_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL hatchwindowfactory_component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
     void * pResult = 0;

svtools/source/productregistration/productregistration.cxx

@@ -453,13 +453,13 @@ namespace svt
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL productregistration_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL productregistration_component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
     void * pResult = 0;

svtools/source/productregistration/productregistration.uno.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="productregistration"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.setup.ProductRegistration">
     <service name="com.sun.star.setup.ProductRegistration"/>

svtools/source/uno/miscservices.cxx

@@ -96,13 +96,13 @@ DECLARE_CREATEINSTANCE_NAMESPACE( unographic, GraphicRendererVCL )
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL svt_component_getImplementationEnvironment (
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
     const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
     void * pResult = 0;

svtools/util/svt.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svt"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.graphic.GraphicProvider">
     <service name="com.sun.star.graphic.GraphicProvider"/>

toolkit/source/helper/registerservices.cxx

@@ -236,12 +236,12 @@ extern void * SAL_CALL comp_Layout_component_getFactory( const char * implName,
 extern "C"
 {
 
-TOOLKIT_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, uno_Environment** )
+TOOLKIT_DLLPUBLIC void SAL_CALL tk_component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, uno_Environment** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* _pRegistryKey )
+TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* _pRegistryKey )
 {
     void* pRet = NULL;
 

toolkit/util/tk.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="tk"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.awt.comp.AsyncCallback">
     <service name="com.sun.star.awt.AsyncCallback"/>

unotools/source/ucbhelper/xtempfile.cxx

@@ -486,7 +486,7 @@ throw ( ::css::uno::RuntimeException )
 
 // C functions to implement this as a component
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL utl_component_getImplementationEnvironment(
                 const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -499,7 +499,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
  * @param pRegistryKey registry data key to read and write component persistent data
  * @return a component factory (generic uno interface)
  */
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL utl_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;

unotools/util/utl.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="utl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.io.comp.TempFile">
     <service name="com.sun.star.io.TempFile"/>

vcl/source/components/factory.cxx

@@ -83,14 +83,14 @@ namespace rsvg
 
 extern "C" {
 
-    VCL_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+    VCL_DLLPUBLIC void SAL_CALL vcl_component_getImplementationEnvironment(
         const sal_Char** ppEnvTypeName,
         uno_Environment** /*ppEnv*/ )
     {
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    VCL_DLLPUBLIC void* SAL_CALL component_getFactory(
+    VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory(
         const sal_Char* pImplementationName,
         void* pXUnoSMgr,
         void* /*pXUnoKey*/

vcl/vcl.macosx.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl"
     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"/>

vcl/vcl.unx.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.datatransfer.X11ClipboardSupport">
     <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>

vcl/vcl.windows.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vcl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.frame.VCLSessionManagerClient">
     <service name="com.sun.star.frame.SessionManagerClient"/>