summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-11-27 15:13:55 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-11-27 15:17:17 +0000
commit414530e9b24313c04f0151f50b12e26bfe785f54 (patch)
tree40a94adaa3727e2616c4be0f9a3dd0cc6bd9bb31 /extensions
parent69858a99c9b566303551a1bff91172917c5d624f (diff)
Catch exception when online update is disabled.
Change-Id: I21d668a288883b739180c6f68397fcc7ecff7885
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/update/feed/updatefeed.cxx20
1 files changed, 12 insertions, 8 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 12ee3a824249..0af61035bb57 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;
}