[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 2 commits - android/experimental avmedia/source avmedia/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 1 06:01:41 PDT 2012
android/experimental/DocumentLoader/Makefile | 2 ++
android/experimental/DocumentLoader/native-code.cxx | 10 ++++++++++
avmedia/source/framework/soundhandler.cxx | 2 +-
avmedia/source/gstreamer/avmediagstreamer.component | 2 +-
avmedia/source/gstreamer/gstuno.cxx | 2 +-
avmedia/source/quicktime/avmediaQuickTime.component | 2 +-
avmedia/source/quicktime/quicktimeuno.mm | 2 +-
avmedia/source/win/avmediawin.component | 2 +-
avmedia/source/win/winuno.cxx | 2 +-
avmedia/util/avmedia.component | 2 +-
10 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 4a4284f9690fb31da0ec7895e946b5c01f5b7df0
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 15:52:31 2012 +0300
More libs
Change-Id: I2ea26d46f22620d567a23412d7780a95e2715af2
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 6e12d8b..90d640a 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -59,6 +59,8 @@ LIBS = \
fwelo \
fwilo \
fwklo \
+ fwllo \
+ fwmlo \
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 8c5152b..d859f44 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -11,6 +11,10 @@
extern "C"
{
+ extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * fwk_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * fwl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * fwm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -22,6 +26,7 @@ extern "C"
extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * textfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -36,6 +41,10 @@ const lib_to_component_mapping *
lo_get_libmap(void)
{
static lib_to_component_mapping map[] = {
+ { "libavmedialo.a", avmedia_component_getFactory },
+ { "libfwklo.a", fwk_component_getFactory },
+ { "libfwllo.a", fwl_component_getFactory },
+ { "libfwmlo.a", fwm_component_getFactory },
{ "libhwplo.a", hwp_component_getFactory },
{ "liblwpftlo.a", lotuswordpro_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
@@ -47,6 +56,7 @@ lo_get_libmap(void)
{ "libswdlo.a", swd_component_getFactory },
{ "libswlo.a", sw_component_getFactory },
{ "libt602filterlo.a", t602filter_component_getFactory },
+ { "libtextfdlo.a", textfd_component_getFactory },
{ "libunoxmllo.a", unoxml_component_getFactory },
{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
commit 34c095bf720933ee6fc42f56fa1328e78457095f
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 15:18:16 2012 +0300
Use prefixes for the components here
Change-Id: I7bebc936cdb489331c82690c244f72e9c3619b10
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 6d35f88..e45cc6e 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -458,7 +458,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
} // namespace framework
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmedia_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
{
void* pReturn = NULL;
if (pServiceManager != NULL )
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
index efcb94d..83000cf 100644
--- a/avmedia/source/gstreamer/avmediagstreamer.component
+++ b/avmedia/source/gstreamer/avmediagstreamer.component
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediagst" xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.media.Manager_GStreamer">
<service name="com.sun.star.comp.avmedia.Manager_GStreamer"/>
</implementation>
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index affb8eb..b8ca324 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -48,7 +48,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
index aa0251d..23cc7f3 100644
--- a/avmedia/source/quicktime/avmediaQuickTime.component
+++ b/avmedia/source/quicktime/avmediaQuickTime.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediaQuickTime"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
<service name="com.sun.star.media.Manager_QuickTime"/>
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm
index e7f739b..50fcb8f 100644
--- a/avmedia/source/quicktime/quicktimeuno.mm
+++ b/avmedia/source/quicktime/quicktimeuno.mm
@@ -40,7 +40,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaQuickTime_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
index c80c19b..5244872 100644
--- a/avmedia/source/win/avmediawin.component
+++ b/avmedia/source/win/avmediawin.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediawin"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
<service name="com.sun.star.media.Manager_DirectX"/>
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index c3d66c5..32af40e 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -40,7 +40,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
index fa01dc0..06ff2a0 100644
--- a/avmedia/util/avmedia.component
+++ b/avmedia/util/avmedia.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="avmedia"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.framework.SoundHandler">
<service name="com.sun.star.frame.ContentHandler"/>
More information about the Libreoffice-commits
mailing list