diff options
| -rw-r--r-- | android/experimental/DocumentLoader/native-code.cxx | 2 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/native-code.cxx | 2 | ||||
| -rw-r--r-- | android/experimental/desktop/native-code.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 20 |
4 files changed, 10 insertions, 16 deletions
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx index 3961e00839a3..e7ee9f3ff0bf 100644 --- a/android/experimental/DocumentLoader/native-code.cxx +++ b/android/experimental/DocumentLoader/native-code.cxx @@ -65,7 +65,7 @@ lo_get_libmap(void) { "libevtattlo.a", evtatt_component_getFactory }, { "libfileacc.a", fileacc_component_getFactory }, { "libfrmlo.a", frm_component_getFactory }, - { "libfsstorage.uno.a", fsstorage_component_getFactory }, + { "libfsstoragelo.a", fsstorage_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libfwllo.a", fwl_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx index aebe61bc1d64..3fe443599a59 100644 --- a/android/experimental/LibreOffice4Android/native-code.cxx +++ b/android/experimental/LibreOffice4Android/native-code.cxx @@ -92,7 +92,7 @@ lo_get_libmap(void) { "libfileacc.a", fileacc_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfrmlo.a", frm_component_getFactory }, - { "libfsstorage.uno.a", fsstorage_component_getFactory }, + { "libfsstoragelo.a", fsstorage_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libfwllo.a", fwl_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx index b4b71b0da906..932112440174 100644 --- a/android/experimental/desktop/native-code.cxx +++ b/android/experimental/desktop/native-code.cxx @@ -97,7 +97,7 @@ lo_get_libmap(void) { "libfileacc.a", fileacc_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfrmlo.a", frm_component_getFactory }, - { "libfsstorage.uno.a", fsstorage_component_getFactory }, + { "libfsstoragelo.a", fsstorage_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libfwllo.a", fwl_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index f53a672d2a24..db741ada70db 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -533,38 +533,32 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( { "bootstrap.uno.a", bootstrap_component_getFactory }, { "libbootstrap.uno.a", bootstrap_component_getFactory }, - // The .uno ones seems to consistently have a "lib" prefix now for Android, + // The .uno ones seem to consistently have a "lib" prefix now for Android, // but not iOS, hmm. #ifdef ANDROID - { "libconfigmgr.uno.a", configmgr_component_getFactory }, - { "libexpwrap.uno.a", expwrap_component_getFactory }, - { "libfastsax.uno.a", fastsax_component_getFactory }, - { "libi18npool.uno.a", i18npool_component_getFactory }, { "libintrospection.uno.a", introspection_component_getFactory }, - { "liblocalebe1.uno.a", localebe1_component_getFactory }, { "libreflection.uno.a", reflection_component_getFactory }, { "libstocservices.uno.a", stocservices_component_getFactory }, - { "libucpexpand1.uno.a", ucpexpand1_component_getFactory }, #else - { "libconfigmgrlo.a", configmgr_component_getFactory }, - { "libexpwraplo.a", expwrap_component_getFactory }, - { "libfastsaxlo.a", fastsax_component_getFactory }, - { "libi18npoollo.a", i18npool_component_getFactory }, { "introspection.uno.a", introspection_component_getFactory }, - { "liblocalebe1lo.a", localebe1_component_getFactory }, { "reflection.uno.a", reflection_component_getFactory }, { "stocservices.uno.a", stocservices_component_getFactory }, - { "libucpexpand1lo.a", ucpexpand1_component_getFactory }, #endif { "libcomphelper.a", comphelp_component_getFactory }, + { "libconfigmgrlo.a", configmgr_component_getFactory }, { "libdeployment.a", deployment_component_getFactory }, + { "libexpwraplo.a", expwrap_component_getFactory }, + { "libfastsaxlo.a", fastsax_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, + { "libi18npoollo.a", i18npool_component_getFactory }, + { "liblocalebe1lo.a", localebe1_component_getFactory }, { "libpackage2.a", package2_component_getFactory }, { "libsfxlo.a", sfx_component_getFactory }, { "libsvllo.a", svl_component_getFactory }, { "libtklo.a", tk_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, + { "libucpexpand1lo.a", ucpexpand1_component_getFactory }, { "libucpfile1.a", ucpfile_component_getFactory }, { "libutllo.a", utl_component_getFactory }, { "libvcllo.a", vcl_component_getFactory }, |