diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 15:50:28 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 15:50:28 +0000 |
| commit | 36ebad65baa35c089064f7a9c7fbabcf87493afb (patch) | |
| tree | 08be7afb53144f9665e35de3b06532fc5623bbe3 | |
| parent | 690144e6ac894004c9f79d8b6104d2673957dbac (diff) | |
INTEGRATION: CWS updchk10 (1.6.2); FILE MERGED
2007/10/05 05:10:49 obr 1.6.2.1: #i79582# removed implicit knowledge of office update url
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 52cdef0bf..3edf4d55e 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updatefeed.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2007-07-31 15:58:11 $ + * last change: $Author: ihi $ $Date: 2007-11-19 16:50:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -380,9 +380,6 @@ public: rtl::OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPredeterminedUpdateURL() - throw (uno::RuntimeException); - virtual void SAL_CALL cancel() throw (uno::RuntimeException); @@ -455,8 +452,6 @@ private: osl::Condition m_bCancelled; sal_Int32 m_nCommandId; - - rtl::OUString m_aUpdateURL; }; //------------------------------------------------------------------------------ @@ -575,7 +570,6 @@ UpdateInformationProvider::UpdateInformationProvider( } rtl::Bootstrap aVersionFile(aPath); - aVersionFile.getFrom(UNISTRING("UpdateURL"), m_aUpdateURL, rtl::OUString()); rtl::OUString aUserAgent; aVersionFile.getFrom(UNISTRING("UpdateUserAgent"), aUserAgent, rtl::OUString()); @@ -847,14 +841,6 @@ UpdateInformationProvider::getUpdateInformationEnumeration( rtl::OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException) { - // if repository list is empty, try at default update URL - if( repositories.getLength() == 0 ) - { - uno::Sequence< rtl::OUString > aDefaultRepository(1); - aDefaultRepository[0] = m_aUpdateURL; - return getUpdateInformationEnumeration(aDefaultRepository, extensionId); - } - OSL_ASSERT(m_xDocumentBuilder.is()); // reset cancelled flag @@ -956,14 +942,6 @@ UpdateInformationProvider::getUpdateInformation( //------------------------------------------------------------------------------ -sal_Bool SAL_CALL -UpdateInformationProvider::hasPredeterminedUpdateURL() throw (uno::RuntimeException) -{ - return (m_aUpdateURL.getLength() > 0) ? sal_True : sal_False; -} - -//------------------------------------------------------------------------------ - void SAL_CALL UpdateInformationProvider::cancel() throw (uno::RuntimeException) { |