diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-01-29 15:00:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-01-29 15:00:14 +0000 |
| commit | 60e89d34c3cf09fe6d2f9b6a6a130eff468e9642 (patch) | |
| tree | dffc4b43a932b7ed285af963a705448c6a86d8ba /extensions | |
| parent | 12747b8d1c615eb9786681187cc9e6f178a258c9 (diff) | |
INTEGRATION: CWS updchk03b_SRC680 (1.4.38); FILE MERGED
2007/01/26 09:18:30 obr 1.4.38.1: #i73853# do not join with check thread when a check is in progress
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/check/updateprotocol.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 9554346d726f..0dec7485b073 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updateprotocol.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:17:28 $ + * last change: $Author: rt $ $Date: 2007-01-29 16:00:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,10 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _COM_SUN_STAR_DEPLOYMENT_UPDATEINFORMATIONPROVIDER_HPP_ -#include <com/sun/star/deployment/UpdateInformationProvider.hpp> -#endif - #ifndef _COM_SUN_STAR_XML_XPATH_XXPATHAPI_HPP_ #include <com/sun/star/xml/xpath/XXPathAPI.hpp> #endif @@ -105,7 +101,8 @@ bool checkForUpdates( uno::Reference< uno::XComponentContext > const & rxContext, uno::Reference< task::XInteractionHandler > const & rxInteractionHandler, - rtl::OUString& rUpdateURL, rtl::OUString& rVersionFound ) + rtl::OUString& rUpdateURL, rtl::OUString& rVersionFound, + uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider) { OSL_TRACE("checking for updates ..\n"); @@ -129,8 +126,7 @@ checkForUpdates( OSL_ASSERT( rxContext->getServiceManager().is() ); // the update information provider - uno::Reference< deployment::XUpdateInformationProvider > aUpdateInfoProvider = - deployment::UpdateInformationProvider::create( rxContext ); + rUpdateInfoProvider = deployment::UpdateInformationProvider::create( rxContext ); // XPath implementation uno::Reference< xml::xpath::XXPathAPI > xXPath( @@ -140,12 +136,12 @@ checkForUpdates( xXPath->registerNS( UNISTRING("inst"), UNISTRING("http://installation.openoffice.org/description") ); if( rxInteractionHandler.is() ) - aUpdateInfoProvider->setInteractionHandler(rxInteractionHandler); + rUpdateInfoProvider->setInteractionHandler(rxInteractionHandler); try { uno::Sequence< uno::Reference< xml::dom::XElement > > aUpdateInfoList = - aUpdateInfoProvider->getUpdateInformation( aRepositoryList, aInstallSetID ); + rUpdateInfoProvider->getUpdateInformation( aRepositoryList, aInstallSetID ); rtl::OUStringBuffer aBuffer; aBuffer.appendAscii("/child::inst:description[inst:os=\'"); |