[Libreoffice-commits] core.git: extensions/source

[Michael Meeks]

 extensions/source/update/feed/updatefeed.cxx |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 414530e9b24313c04f0151f50b12e26bfe785f54
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Fri Nov 27 15:13:55 2015 +0000

    Catch exception when online update is disabled.
    
    Change-Id: I21d668a288883b739180c6f68397fcc7ecff7885

diff --git a/extensions/source/update/feed/updatefeed.cxx 
b/extensions/source/update/feed/updatefeed.cxx
index 12ee3a8..0af6103 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -339,15 +339,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;
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits