From 96ee8e4dce03d56b9133d91fd9f178bae479ec21 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 9 Oct 2012 12:27:22 +0300
Subject: More libraries

Now the DocumentLoader test app seems to work like it does with all
the separate DSOs, knock on wood. The only "attempting to load unknown
library" message I see in logcat is for libspelllo.a, and I
deliberately don't have a mapping for that. A viewer application
presumably has no use for spell checking. (I do link in the
hyphenation stuff, that affects rendering, and we want the rendering
to match LO on the desktop.)

Change-Id: I1ad9eedf352eb0af1187bdfdc71f8f1754912600
---
 android/experimental/DocumentLoader/Makefile        |  9 +++++++++
 android/experimental/DocumentLoader/native-code.cxx | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 3c1ebbdde085..42a1c1e62b2e 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -59,11 +59,13 @@ LIBS = \
 	eptlo \
 	eralo \
 	etilo \
+	evtattlo \
 	expat_xmlparse \
 	expat_xmltok \
 	explo \
 	expwrap.uno \
 	fastsax.uno \
+	fileacc \
 	filterconfiglo \
 	fontconfig \
 	forlo \
@@ -77,7 +79,10 @@ LIBS = \
 	fwllo \
 	fwmlo \
 	gcc3_uno \
+	hunspell-1.3 \
 	hwplo \
+	hyphen \
+	hyphenlo \
 	i18nisolang1gcc3 \
 	i18npool.uno \
 	i18nregexplo \
@@ -109,6 +114,7 @@ LIBS = \
 	lcms2 \
 	libotouchlo \
 	lnglo \
+	lnthlo \
 	lo-bootstrap \
 	localebe1.uno \
 	localedata_en \
@@ -122,6 +128,7 @@ LIBS = \
 	msfilterlo \
 	mspublib \
 	mswordlo \
+	mythes-1.2 \
 	ooxlo \
 	orcus \
 	package2 \
@@ -145,6 +152,7 @@ LIBS = \
 	smdlo \
 	smlo \
 	sotlo \
+	spelllo \
 	spllo \
 	stocservices.uno \
 	store \
@@ -169,6 +177,7 @@ LIBS = \
 	ucbhelper4gcc3 \
 	ucpfile1 \
 	ucppkg1 \
+	ulingu \
 	uno_cppu \
 	uno_cppuhelpergcc3 \
 	uno_sal \
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index cae7b52409aa..d4ef4b0e82fe 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -13,12 +13,20 @@ extern "C"
 {
     extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * fileacc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * fsstorage_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 * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+    extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -49,14 +57,22 @@ lo_get_libmap(void)
     static lib_to_component_mapping map[] = {
         { "libavmedialo.a", avmedia_component_getFactory },
         { "libdbaxmllo.a", dbaxml_component_getFactory },
+        { "libevtattlo.a", evtatt_component_getFactory },
+        { "libfileacc.a", fileacc_component_getFactory },
+        { "libfrmlo.a", frm_component_getFactory },
+        { "libfsstorage.uno.a", fsstorage_component_getFactory },
         { "libfwklo.a", fwk_component_getFactory },
         { "libfwllo.a", fwl_component_getFactory },
         { "libfwmlo.a", fwm_component_getFactory },
         { "libhwplo.a", hwp_component_getFactory },
+        { "libhyphenlo.a", hyphen_component_getFactory },
+        { "liblnglo.a", lng_component_getFactory },
+        { "liblnthlo.a", lnth_component_getFactory },
         { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
         { "libscfiltlo.a", scfilt_component_getFactory },
+        { "libsblo.a", sb_component_getFactory },
         { "libsclo.a", sc_component_getFactory },
         { "libsddlo.a", sdd_component_getFactory },
         { "libsdlo.a", sd_component_getFactory },
-- 
cgit