diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-11-27 15:13:55 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-30 14:33:42 +0100 |
| commit | 51b479185e03c4b24b84e0360dc324f6980d5106 (patch) | |
| tree | be42b8045fd376afa6065199c6c8c6df1367aa5f /extensions | |
| parent | f9a135b5094d49920b1224cb4a5ee92a7410d269 (diff) | |
Catch exception when online update is disabled.
Change-Id: I21d668a288883b739180c6f68397fcc7ecff7885
(cherry picked from commit 414530e9b24313c04f0151f50b12e26bfe785f54)
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index cbe9139b0c69..699cf8d2ebe6 100644 --- 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; } |