From d50f3c5922411304b4291953a4cc9f07f4730892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Tue, 2 Oct 2012 11:01:23 +0200
Subject: [PATCH] stoc: prefix more libs; only bootstrap is remaining

Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9
---
 cpputools/source/registercomponent/registercomponent.cxx | 6 ++++--
 stoc/source/javaloader/javaloader.component              | 2 +-
 stoc/source/javaloader/javaloader.cxx                    | 2 +-
 stoc/source/javavm/javavm.component                      | 2 +-
 stoc/source/javavm/javavm.cxx                            | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index 06c38f5e7d80..950952b5d880 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -722,13 +722,15 @@ static void bootstrap(
             OUString(),
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")),
             xSMgr,
-            Reference< XRegistryKey > () );
+            Reference< XRegistryKey > (),
+            "javavm" );
         Reference< XInterface > r2 = loadSharedLibComponentFactory(
             OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)),
             OUString(),
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")),
             xSMgr,
-            Reference< XRegistryKey > () );
+            Reference< XRegistryKey > (),
+            "javaloader" );
         Reference <XSet> xSet( xSMgr, UNO_QUERY );
         if( r.is() && r2.is() && xSet.is() )
         {
diff --git a/stoc/source/javaloader/javaloader.component b/stoc/source/javaloader/javaloader.component
index bb2ea0f97ba5..5fd7d8671a5f 100644
--- a/stoc/source/javaloader/javaloader.component
+++ b/stoc/source/javaloader/javaloader.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="javaloader"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.JavaComponentLoader">
     <service name="com.sun.star.loader.Java"/>
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 7bfe44080d03..cb48b6cf83fc 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -435,7 +435,7 @@ static struct ImplementationEntry g_entries[] =
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL javaloader_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/javavm/javavm.component b/stoc/source/javavm/javavm.component
index 1394b5b62b8d..570ce4c635d4 100644
--- a/stoc/source/javavm/javavm.component
+++ b/stoc/source/javavm/javavm.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="javavm"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.JavaVirtualMachine">
     <service name="com.sun.star.java.JavaVirtualMachine"/>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index fbb1c89d3721..4667fee609fc 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -598,7 +598,7 @@ private:
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL javavm_component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager,
                                                 void * pRegistryKey)
 {