[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 2 commits - android/experimental sd/source

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/Makefile |   24 ++++++++++++++++++++++++
 sd/source/filter/cgm/sdcgmfilter.cxx         |    2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 731cd0d6f5bc34efb99aa8b553a76fd803fa59db
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 8 12:00:31 2012 +0300

    Even more libs
    
    Change-Id: I055b3d1a3105475883283c32a46141c38ed350fa

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 5addd20..2e65f1d 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -26,6 +26,7 @@ endef
 LIBS = \
   -Wl,--start-group \
   $(addprefix -l,$(strip \
+	acclo \
 	ascii_expat_xmlparse \
 	avmedialo \
 	basebmp \
@@ -47,8 +48,17 @@ LIBS = \
 	dict_zh \
 	drawinglayerlo \
 	editenglo \
+	egilo \
+	emelo \
+	epblo \
+	epplo \
+	epslo \
+	eptlo \
+	eralo \
+	etilo \
 	expat_xmlparse \
 	expat_xmltok \
+	explo \
 	expwrap.uno \
 	fastsax.uno \
 	filterconfiglo \
@@ -70,13 +80,25 @@ LIBS = \
 	i18nregexplo \
 	i18nsearch.uno \
 	i18nutilgcc3 \
+	icdlo \
+	icglo \
 	icudata \
 	icui18n \
 	icule \
 	icutu \
 	icuuc \
+	idxlo \
+	imelo \
 	index_data \
 	introspection.uno \
+	ipblo \
+	ipdlo \
+	ipslo \
+	iptlo \
+	ipxlo \
+	iralo \
+	itglo \
+	itilo \
 	java_uno \
 	jpeg \
 	jvmaccessgcc3 \
@@ -111,9 +133,11 @@ LIBS = \
 	sclo \
 	scdlo \
 	scfiltlo \
+	scuilo \
 	sddlo \
 	sdfiltlo \
 	sdlo \
+	sduilo \
 	sfxlo \
 	smdlo \
 	smlo \
commit 15e0ff4ceab6bb1877e033eec68b6e949cf9d383
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 8 12:00:02 2012 +0300

    Thinko
    
    Change-Id: I0439bd8b0121de108492ee1bfd37e69007832439

diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index b33b4ce..552ef14 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -107,7 +107,7 @@ sal_Bool SdCGMFilter::Import()
        mxModel.is() )
     {
 #ifndef DISABLE_DYNLOADING
-        ImportCGMPointer FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol(  "ImportCGM" ) );
+        ImportCGMPointer FncImportCGM = reinterpret_cast< ImportCGMPointer >( pLibrary->getFunctionSymbol(  "ImportCGM" ) );
 #else
         ImportCGMPointer FncImportCGM = ImportCGM;
 #endif