diff options
| -rw-r--r-- | extensions/Library_updatefeed.mk | 5 | ||||
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 12 | ||||
| -rw-r--r-- | offapi/com/sun/star/awt/XToolkitExperimental.idl | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 9 |
4 files changed, 7 insertions, 23 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); diff --git a/offapi/com/sun/star/awt/XToolkitExperimental.idl b/offapi/com/sun/star/awt/XToolkitExperimental.idl index 72fb3593242e..3b7305739331 100644 --- a/offapi/com/sun/star/awt/XToolkitExperimental.idl +++ b/offapi/com/sun/star/awt/XToolkitExperimental.idl @@ -22,10 +22,6 @@ interface XToolkitExperimental : XToolkit2 /** Process all pending idle events */ void processEventsToIdle(); - - /** Get misc. information for User-Agent: - */ - string getHWOSConfInfo(); }; }; }; }; }; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index bf1a3adcd5a4..af5b603afa7d 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -194,8 +194,6 @@ public: // css::awt::XToolkitExperimental virtual void SAL_CALL processEventsToIdle() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHWOSConfInfo() - throw (::css::uno::RuntimeException, ::std::exception) override; // css::awt::XToolkit css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getDesktopWindow( ) throw(css::uno::RuntimeException, std::exception) override; @@ -1915,13 +1913,6 @@ void SAL_CALL VCLXToolkit::processEventsToIdle() Scheduler::ProcessEventsToIdle(); } -OUString SAL_CALL VCLXToolkit::getHWOSConfInfo() - throw (::css::uno::RuntimeException, ::std::exception) -{ - SolarMutexGuard aSolarGuard; - return Application::GetHWOSConfInfo(); -} - // css:awt:XToolkitRobot void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent ) |