[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - extensions/Library_updatefeed.mk extensions/source offapi/com toolkit/source

[Stephan Bergmann]

 extensions/Library_updatefeed.mk                 |    5 +++++
 extensions/source/update/feed/updatefeed.cxx     |   12 ++----------
 offapi/com/sun/star/awt/XToolkitExperimental.idl |    4 ----
 toolkit/source/awt/vclxtoolkit.cxx               |    9 ---------
 4 files changed, 7 insertions(+), 23 deletions(-)

New commits:
commit f9694fd08c303dc3d2b8a1e30644adfed1d7951d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 27 18:46:18 2015 +0100

    No need to extend css.awt.XToolkitExperimental
    
    Change-Id: Idbaca99c9376ade11cd36526c0f667562a2d9c53
    (cherry picked from commit 2759ea0e64adc1d113fdd2b568a317999fa16cfb)

diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index 5c5a5cb..8b9328e 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 12ee3a8..cbe9139 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 ;
@@ -383,14 +382,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 72fb359..3b73057 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 72a0cb4..32aa182 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 )