Catch exception when online update is disabled.

Change-Id: I21d668a288883b739180c6f68397fcc7ecff7885 (cherry picked from commit 414530e9)

Catch exception when online update is disabled.
Change-Id: I21d668a288883b739180c6f68397fcc7ecff7885 (cherry picked from commit 414530e9)
51b47918 · Michael Meeks · Michael Stahl · f9a135b5 · 51b47918
Kaydet (Commit) 51b47918 authored Kas 27, 2015 tarafından Michael Meeks Kaydeden (comit) Michael Stahl Kas 30, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

updatefeed.cxx extensions/source/update/feed/updatefeed.cxx +12 -8

No files found.
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -338,15 +338,19 @@ UpdateInformationProvider::UpdateInformationProvider(
 bool
 UpdateInformationProvider::isUserAgentExtended()
 {
-    uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(
-        css::configuration::theDefaultProvider::get(m_xContext));
-
-    uno::Any aExtended = getConfigurationItemAny(
-        xConfigurationProvider,
-        "org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments",
-        "ExtendedUserAgent");
    bool bExtendedUserAgent = false;
-    aExtended >>= bExtendedUserAgent;
+    try {
+        uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(
+            css::configuration::theDefaultProvider::get(m_xContext));
+
+        uno::Any aExtended = getConfigurationItemAny(
+            xConfigurationProvider,
+            "org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments",
+            "ExtendedUserAgent");
+        aExtended >>= bExtendedUserAgent;
+    } catch (const uno::RuntimeException &) {
+        SAL_WARN("extensions.update", "Online update disabled");
+    }
    return bExtendedUserAgent;
 }