stoc: prefix more libs; only bootstrap is remaining
Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9
This commit is contained in:
parent
95630ef04b
commit
d50f3c5922
5 changed files with 8 additions and 6 deletions
|
@ -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() )
|
||||
{
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue