diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:31:21 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:33:47 +0100 |
| commit | f1d1986a97aa9812dd045f6864a61964b7b9301a (patch) | |
| tree | 3e61fe84b8cdf7d58b963e416a11eade98afd1cd | |
| parent | 5f09718dba16ac7eb8f0917051f1ea532940a788 (diff) | |
android: linguistic should cope with a missing extension manager
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 3 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 1 | ||||
| -rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index f3c4fe5dfe30..8bae333ccd2b 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -58,7 +58,6 @@ copy-stuff: jvmaccessgcc3 \ jvmfwk \ libotouchlo \ - lnglo \ lnthlo \ lo-bootstrap \ localebe1.uno \ @@ -241,4 +240,4 @@ build-ant: copy-stuff properties run: # /data/local/tmp/sample-document.odt - adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt + adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt -e lo-main-delay 20 diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index b2f57d1e3431..84d8f81e585c 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -116,7 +116,6 @@ copy-stuff: buildrcs jvmaccessgcc3 \ jvmfwk \ libotouchlo \ - lnglo \ introspection.uno \ lnthlo \ localebe1.uno \ diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 6dc2d69a34ae..0a5de43332f2 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -491,8 +491,12 @@ LngSvcMgr::LngSvcMgr() // request to be notified if an extension has been added/removed uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext()); - uno::Reference<deployment::XExtensionManager> xExtensionManager( - deployment::ExtensionManager::get(xContext)); + uno::Reference<deployment::XExtensionManager> xExtensionManager; + try { + xExtensionManager = deployment::ExtensionManager::get(xContext); + } catch ( const deployment::DeploymentException & ) { + SAL_WARN( "linguistic", "no extension manager - should fire on mobile only" ); + } if (xExtensionManager.is()) { xMB = uno::Reference<util::XModifyBroadcaster>(xExtensionManager, uno::UNO_QUERY_THROW); |