libmerged: add fsstorage, svl, sot, vcl

Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412

7 files changed, 0 insertions, 18 deletions

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 279f6a4a72a2..b9a75eec6f85 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -69,7 +69,6 @@ copy-stuff:
 		   forlo \
 		   foruilo \
 		   frmlo \
-		   fsstorage.uno \
 		   gcc3_uno \
 		   hwplo \
 		   i18nisolang1gcc3 \
@@ -103,11 +102,9 @@ copy-stuff:
 		   scfiltlo \
 		   sddlo \
 		   smdlo \
-		   sotlo \
 		   stocservices.uno \
 		   store \
 		   svgfilterlo \
-		   svllo \
 		   swdlo \
 		   swlo \
 		   t602filterlo \
@@ -127,7 +124,6 @@ copy-stuff:
 		   vbaswobj.uno \
 		   wpftdrawlo \
 		   wpftwriterlo \
-		   vcllo \
 		   xml2 \
 		   xmlfdlo \
 		   xmlreader \
diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 97797dfdf7a4..39a8f016efa3 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -933,7 +933,6 @@ public class DocumentLoader
 
             // Load a lot of shlibs here explicitly in advance because that
             // makes debugging work better, sigh
-            Bootstrap.dlopen("libvcllo.so");
             Bootstrap.dlopen("libmergedlo.so");
             Bootstrap.dlopen("libswdlo.so");
             Bootstrap.dlopen("libswlo.so");
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 0bfbf3b87315..bb2c02eb2493 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -39,7 +39,6 @@ copy-stuff:
 		   forlo \
 		   foruilo \
 		   frmlo \
-		   fsstorage.uno \
 		   gcc3_uno \
 		   hwplo \
 		   hyphenlo \
@@ -79,12 +78,10 @@ copy-stuff:
 		   sdlo \
 		   sddlo \
 		   smdlo \
-		   sotlo \
 		   spelllo \
 		   stocservices.uno \
 		   store \
 		   svgfilterlo \
-		   svllo \
 		   swdlo \
 		   swlo \
 		   swdlo \
@@ -105,7 +102,6 @@ copy-stuff:
 		   vbaswobj.uno \
 		   wpftdrawlo \
 		   wpftwriterlo \
-		   vcllo \
 		   xml2 \
 		   xmlfdlo \
 		   xmlreader \
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index bfa3eec66c23..9f9790cf2d9f 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -963,7 +963,6 @@ public class DocumentLoader
 
             // Load a lot of shlibs here explicitly in advance because that
             // makes debugging work better, sigh
-            Bootstrap.dlopen("libvcllo.so");
             Bootstrap.dlopen("libmergedlo.so");
             Bootstrap.dlopen("libswdlo.so");
             Bootstrap.dlopen("libswlo.so");
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 2a2b22f9d044..c2ce1d444d57 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -747,7 +747,6 @@ class ListItemAdapter implements ListAdapter{
 
                     // Load a lot of shlibs here explicitly in advance because that
                     // makes debugging work better, sigh
-                    Bootstrap.dlopen("libvcllo.so");
                     Bootstrap.dlopen("libmergedlo.so");
                     Bootstrap.dlopen("libswdlo.so");
                     Bootstrap.dlopen("libswlo.so");
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 7ad9ac0270dc..3c9efd7fb6be 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -101,7 +101,6 @@ copy-stuff: buildrcs
 		  expwrap.uno \
 		  forlo \
 		  foruilo \
-		  fsstorage.uno \
 		  gcc3_uno \
 		  hyphenlo \
 		  i18nisolang1gcc3 \
@@ -127,11 +126,9 @@ copy-stuff: buildrcs
 		  reflection.uno \
 		  reg \
 		  saxlo \
-		  sotlo \
 		  spelllo \
 		  stocservices.uno \
 		  store \
-		  svllo \
 		  test \
 		  tllo \
 		  ucbhelper4gcc3 \
@@ -144,7 +141,6 @@ copy-stuff: buildrcs
 		  unoxmllo \
 		  utllo \
 		  vbahelperlo \
-		  vcllo \
 		  xml2 \
 		  xmlreader \
 		  xmlsecurity \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index f3e47954c316..1c70fd86e11d 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,10 +91,8 @@ copy-stuff:
 		  saxlo \
 		  sclo \
 		  scfiltlo \
-		  sotlo \
 		  stocservices.uno \
 		  store \
-		  svllo \
 		  textinstream.uno \
 		  test \
 		  tllo \
@@ -108,7 +106,6 @@ copy-stuff:
 		  unoxmllo \
 		  utllo \
 		  vbahelperlo \
-		  vcllo \
 		  xml2 \
 		  xmlreader \
 		  xstor \