cpputools/source/registercomponent/registercomponent.cxx | 6 ++- cpputools/source/unoexe/unoexe.cxx | 28 ++++++--------- stoc/source/javaloader/javaloader.component | 2 - stoc/source/javaloader/javaloader.cxx | 2 - stoc/source/javavm/javavm.component | 2 - stoc/source/javavm/javavm.cxx | 2 - 6 files changed, 20 insertions(+), 22 deletions(-)
New commits: commit d50f3c5922411304b4291953a4cc9f07f4730892 Author: Matúš Kukan <[email protected]> Date: Tue Oct 2 11:01:23 2012 +0200 stoc: prefix more libs; only bootstrap is remaining Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9 diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx index 06c38f5..950952b 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 bb2ea0f..5fd7d86 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 7bfe440..cb48b6c 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 1394b5b..570ce4c 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 fbb1c89..4667fee 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) { commit 95630ef04b9df092653fb2f68d91a7e6100f7a4e Author: Matúš Kukan <[email protected]> Date: Tue Oct 2 10:57:38 2012 +0200 these libs are now prefixed Change-Id: Ida3cc87ef2ef6fdb40b03d0401fbefa5e7cd7c92 diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index d9a92e3..db3e63b 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -257,29 +257,25 @@ void createInstance( Reference< XMultiServiceFactory > xSF( xMgr, UNO_QUERY ); // acceptor xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "acceptor.uno" SAL_DLLEXTENSION) ), + OUString( "acceptor.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Acceptor") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Acceptor" ), + xSF, Reference< XRegistryKey >(), + "acceptor" ) ) ); // connector xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "connector.uno" SAL_DLLEXTENSION) ), + OUString( "connector.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Connector") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Connector" ), + xSF, Reference< XRegistryKey >(), + "connector" ) ) ); // bridge factory xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "binaryurp.uno" SAL_DLLEXTENSION) ), + OUString( "binaryurp.uno" SAL_DLLEXTENSION ), OUString(), - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.bridge.BridgeFactory") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.bridge.BridgeFactory" ), + xSF, Reference< XRegistryKey >(), + "binaryurp" ) ) ); } s_bSet = sal_True; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
