diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 18:46:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 18:46:18 +0100 |
| commit | 2759ea0e64adc1d113fdd2b568a317999fa16cfb (patch) | |
| tree | b736c47c4736419d024c4b200c0f9715b53791d3 /extensions | |
| parent | 11a8e72a5fddd020ce03fd4c7815dda98c2b75f7 (diff) | |
No need to extend css.awt.XToolkitExperimental
Change-Id: Idbaca99c9376ade11cd36526c0f667562a2d9c53
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_updatefeed.mk | 5 | ||||
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk index 5c5a5cbd119a..8b9328e30e23 100644 --- a/extensions/Library_updatefeed.mk +++ b/extensions/Library_updatefeed.mk @@ -11,12 +11,17 @@ $(eval $(call gb_Library_Library,updatefeed)) $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed)) +$(eval $(call gb_Library_use_externals,updatefeed, \ + boost_headers \ +)) + $(eval $(call gb_Library_use_sdk_api,updatefeed)) $(eval $(call gb_Library_use_libraries,updatefeed,\ cppuhelper \ cppu \ sal \ + vcl \ )) $(eval $(call gb_Library_add_exception_objects,updatefeed,\ diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 0af61035bb57..699cf8d2ebe6 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -46,8 +46,6 @@ #include <com/sun/star/task/PasswordContainerInteractionHandler.hpp> #include <com/sun/star/xml/dom/DocumentBuilder.hpp> #include <com/sun/star/xml/xpath/XPathAPI.hpp> -#include <com/sun/star/awt/Toolkit.hpp> -#include <com/sun/star/awt/XToolkitExperimental.hpp> #include <rtl/ref.hxx> #include <rtl/bootstrap.hxx> @@ -56,6 +54,7 @@ #include <osl/diagnose.h> #include <osl/process.h> #include <osl/conditn.hxx> +#include <vcl/svapp.hxx> namespace beans = com::sun::star::beans ; namespace container = com::sun::star::container ; @@ -387,14 +386,7 @@ OUString UpdateInformationProvider::getUserAgent(bool bExtended) OUString aExtended; if( bExtended ) { - try { - uno::Reference< css::awt::XToolkitExperimental > xToolkit( - css::awt::Toolkit::create( m_xContext ), uno::UNO_QUERY_THROW ); - if ( xToolkit.is() ) - aExtended = xToolkit->getHWOSConfInfo(); - } catch (const uno::Exception &) { - SAL_WARN( "extensions.update", "Failed to find version info from toolkit" ); - } + aExtended = Application::GetHWOSConfInfo(); } rtl::Bootstrap::expandMacros( aUserAgent ); aUserAgent = aUserAgent.replaceAll("<PRODUCT>", product); |