diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-02 11:01:23 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-02 11:10:04 +0200 |
| commit | d50f3c5922411304b4291953a4cc9f07f4730892 (patch) | |
| tree | c9e5d9d0199faa51e7296dce5161b50f80df2f13 /stoc | |
| parent | 95630ef04b9df092653fb2f68d91a7e6100f7a4e (diff) | |
stoc: prefix more libs; only bootstrap is remaining
Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javaloader/javaloader.component | 2 | ||||
| -rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 2 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.component | 2 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
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) { |