Skip to content

C
core
Kaydet (Commit) c082bf7a authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

Cleanup while reading extensions. 

Change-Id: I99c630c2b497b695365728ce5a2497ff64ff9f1a
üst 056bce9c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 97 deletions
extensions/Library_updatecheckui.mk
Dosyayı görüntüle @ c082bf7a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# #
#
# This file is part of the LibreOffice project. # This file is part of the LibreOffice project.
# #
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
#
$(eval $(call gb_Library_Library,updatecheckui)) $(eval $(call gb_Library_Library,updatecheckui))
......
extensions/Library_updatefeed.mk
Dosyayı görüntüle @ c082bf7a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# #
#
# This file is part of the LibreOffice project. # This file is part of the LibreOffice project.
# #
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
#
$(eval $(call gb_Library_Library,updatefeed)) $(eval $(call gb_Library_Library,updatefeed))
......
extensions/Library_updchk.mk
Dosyayı görüntüle @ c082bf7a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# #
#
# This file is part of the LibreOffice project. # This file is part of the LibreOffice project.
# #
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
#
$(eval $(call gb_Library_Library,updchk)) $(eval $(call gb_Library_Library,updchk))
......
extensions/source/update/check/updatecheckconfig.cxx
Dosyayı görüntüle @ c082bf7a
...@@ -80,14 +80,10 @@ static const sal_Char * const aUpdateEntryProperties[] = { ...@@ -80,14 +80,10 @@ static const sal_Char * const aUpdateEntryProperties[] = {
static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties); static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties);
NamedValueByNameAccess::~NamedValueByNameAccess() NamedValueByNameAccess::~NamedValueByNameAccess()
{ {
} }
css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName) css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName)
{ {
const sal_Int32 nLen = m_rValues.getLength(); const sal_Int32 nLen = m_rValues.getLength();
...@@ -99,25 +95,18 @@ css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName) ...@@ -99,25 +95,18 @@ css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName)
return css::uno::Any(); return css::uno::Any();
} }
bool bool
UpdateCheckROModel::isAutoCheckEnabled() const UpdateCheckROModel::isAutoCheckEnabled() const
{ {
return m_aNameAccess.getValue(AUTOCHECK_ENABLED).get<bool>(); return m_aNameAccess.getValue(AUTOCHECK_ENABLED).get<bool>();
} }
bool bool
UpdateCheckROModel::isDownloadPaused() const UpdateCheckROModel::isDownloadPaused() const
{ {
return m_aNameAccess.getValue(DOWNLOAD_PAUSED).get<bool>(); return m_aNameAccess.getValue(DOWNLOAD_PAUSED).get<bool>();
} }
OUString OUString
UpdateCheckROModel::getStringValue(const sal_Char * pStr) const UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
{ {
...@@ -129,15 +118,11 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const ...@@ -129,15 +118,11 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
return aRet; return aRet;
} }
OUString UpdateCheckROModel::getLocalFileName() const OUString UpdateCheckROModel::getLocalFileName() const
{ {
return getStringValue(LOCAL_FILE); return getStringValue(LOCAL_FILE);
}; };
sal_Int64 UpdateCheckROModel::getDownloadSize() const sal_Int64 UpdateCheckROModel::getDownloadSize() const
{ {
uno::Any aAny( m_aNameAccess.getValue(DOWNLOAD_SIZE) ); uno::Any aAny( m_aNameAccess.getValue(DOWNLOAD_SIZE) );
...@@ -147,16 +132,12 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const ...@@ -147,16 +132,12 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const
return nRet; return nRet;
}; };
OUString OUString
UpdateCheckROModel::getUpdateEntryVersion() const UpdateCheckROModel::getUpdateEntryVersion() const
{ {
return getStringValue(OLD_VERSION); return getStringValue(OLD_VERSION);
} }
void void
UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
{ {
...@@ -179,9 +160,6 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const ...@@ -179,9 +160,6 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
} }
} }
OUString UpdateCheckConfig::getDesktopDirectory() OUString UpdateCheckConfig::getDesktopDirectory()
{ {
OUString aRet; OUString aRet;
...@@ -209,8 +187,6 @@ OUString UpdateCheckConfig::getDesktopDirectory() ...@@ -209,8 +187,6 @@ OUString UpdateCheckConfig::getDesktopDirectory()
return aRet; return aRet;
} }
OUString UpdateCheckConfig::getAllUsersDirectory() OUString UpdateCheckConfig::getAllUsersDirectory()
{ {
OUString aRet; OUString aRet;
...@@ -230,7 +206,6 @@ OUString UpdateCheckConfig::getAllUsersDirectory() ...@@ -230,7 +206,6 @@ OUString UpdateCheckConfig::getAllUsersDirectory()
return aRet; return aRet;
} }
UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer, UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer,
const uno::Reference<container::XNameContainer>& xAvailableUpdates, const uno::Reference<container::XNameContainer>& xAvailableUpdates,
const uno::Reference<container::XNameContainer>& xIgnoredUpdates, const uno::Reference<container::XNameContainer>& xIgnoredUpdates,
...@@ -241,12 +216,9 @@ UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameConta ...@@ -241,12 +216,9 @@ UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameConta
m_rListener( rListener ) m_rListener( rListener )
{} {}
UpdateCheckConfig::~UpdateCheckConfig() UpdateCheckConfig::~UpdateCheckConfig()
{} {}
::rtl::Reference< UpdateCheckConfig > ::rtl::Reference< UpdateCheckConfig >
UpdateCheckConfig::get( UpdateCheckConfig::get(
const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference<uno::XComponentContext>& xContext,
...@@ -278,8 +250,6 @@ UpdateCheckConfig::get( ...@@ -278,8 +250,6 @@ UpdateCheckConfig::get(
return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener ); return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
} }
bool bool
UpdateCheckConfig::isAutoCheckEnabled() const UpdateCheckConfig::isAutoCheckEnabled() const
{ {
...@@ -288,8 +258,6 @@ UpdateCheckConfig::isAutoCheckEnabled() const ...@@ -288,8 +258,6 @@ UpdateCheckConfig::isAutoCheckEnabled() const
return nValue; return nValue;
} }
bool bool
UpdateCheckConfig::isAutoDownloadEnabled() const UpdateCheckConfig::isAutoDownloadEnabled() const
{ {
...@@ -298,8 +266,6 @@ UpdateCheckConfig::isAutoDownloadEnabled() const ...@@ -298,8 +266,6 @@ UpdateCheckConfig::isAutoDownloadEnabled() const
return nValue; return nValue;
} }
OUString OUString
UpdateCheckConfig::getUpdateEntryVersion() const UpdateCheckConfig::getUpdateEntryVersion() const
{ {
...@@ -311,8 +277,6 @@ UpdateCheckConfig::getUpdateEntryVersion() const ...@@ -311,8 +277,6 @@ UpdateCheckConfig::getUpdateEntryVersion() const
return aValue; return aValue;
} }
sal_Int64 sal_Int64
UpdateCheckConfig::getLastChecked() const UpdateCheckConfig::getLastChecked() const
{ {
...@@ -324,8 +288,6 @@ UpdateCheckConfig::getLastChecked() const ...@@ -324,8 +288,6 @@ UpdateCheckConfig::getLastChecked() const
return nValue; return nValue;
} }
sal_Int64 sal_Int64
UpdateCheckConfig::getCheckInterval() const UpdateCheckConfig::getCheckInterval() const
{ {
...@@ -337,8 +299,6 @@ UpdateCheckConfig::getCheckInterval() const ...@@ -337,8 +299,6 @@ UpdateCheckConfig::getCheckInterval() const
return nValue; return nValue;
} }
OUString OUString
UpdateCheckConfig::getLocalFileName() const UpdateCheckConfig::getLocalFileName() const
{ {
...@@ -351,8 +311,6 @@ UpdateCheckConfig::getLocalFileName() const ...@@ -351,8 +311,6 @@ UpdateCheckConfig::getLocalFileName() const
return aRet; return aRet;
} }
OUString OUString
UpdateCheckConfig::getDownloadDestination() const UpdateCheckConfig::getDownloadDestination() const
{ {
...@@ -364,8 +322,6 @@ UpdateCheckConfig::getDownloadDestination() const ...@@ -364,8 +322,6 @@ UpdateCheckConfig::getDownloadDestination() const
return aRet; return aRet;
} }
void void
UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize) UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize)
{ {
...@@ -384,8 +340,6 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 ...@@ -384,8 +340,6 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64
commitChanges(); commitChanges();
} }
void void
UpdateCheckConfig::clearLocalFileName() UpdateCheckConfig::clearLocalFileName()
{ {
...@@ -401,8 +355,6 @@ UpdateCheckConfig::clearLocalFileName() ...@@ -401,8 +355,6 @@ UpdateCheckConfig::clearLocalFileName()
commitChanges(); commitChanges();
} }
void void
UpdateCheckConfig::storeDownloadPaused(bool paused) UpdateCheckConfig::storeDownloadPaused(bool paused)
{ {
...@@ -410,8 +362,6 @@ UpdateCheckConfig::storeDownloadPaused(bool paused) ...@@ -410,8 +362,6 @@ UpdateCheckConfig::storeDownloadPaused(bool paused)
commitChanges(); commitChanges();
} }
void void
UpdateCheckConfig::updateLastChecked() UpdateCheckConfig::updateLastChecked()
{ {
...@@ -423,8 +373,6 @@ UpdateCheckConfig::updateLastChecked() ...@@ -423,8 +373,6 @@ UpdateCheckConfig::updateLastChecked()
replaceByName(LAST_CHECK, uno::makeAny(lastCheck)); replaceByName(LAST_CHECK, uno::makeAny(lastCheck));
} }
void void
UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild) UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild)
...@@ -460,8 +408,6 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC ...@@ -460,8 +408,6 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC
commitChanges(); commitChanges();
} }
void void
UpdateCheckConfig::clearUpdateFound() UpdateCheckConfig::clearUpdateFound()
{ {
...@@ -489,8 +435,6 @@ UpdateCheckConfig::clearUpdateFound() ...@@ -489,8 +435,6 @@ UpdateCheckConfig::clearUpdateFound()
commitChanges(); commitChanges();
} }
uno::Sequence< OUString > uno::Sequence< OUString >
UpdateCheckConfig::getServiceNames() UpdateCheckConfig::getServiceNames()
{ {
...@@ -498,32 +442,24 @@ UpdateCheckConfig::getServiceNames() ...@@ -498,32 +442,24 @@ UpdateCheckConfig::getServiceNames()
return aServiceList; return aServiceList;
} }
OUString OUString
UpdateCheckConfig::getImplName() UpdateCheckConfig::getImplName()
{ {
return OUString("vnd.sun.UpdateCheckConfig"); return OUString("vnd.sun.UpdateCheckConfig");
} }
uno::Type SAL_CALL uno::Type SAL_CALL
UpdateCheckConfig::getElementType() throw (uno::RuntimeException, std::exception) UpdateCheckConfig::getElementType() throw (uno::RuntimeException, std::exception)
{ {
return m_xContainer->getElementType(); return m_xContainer->getElementType();
} }
sal_Bool SAL_CALL sal_Bool SAL_CALL
UpdateCheckConfig::hasElements() throw (uno::RuntimeException, std::exception) UpdateCheckConfig::hasElements() throw (uno::RuntimeException, std::exception)
{ {
return m_xContainer->hasElements(); return m_xContainer->hasElements();
} }
uno::Any SAL_CALL uno::Any SAL_CALL
UpdateCheckConfig::getByName( const OUString& aName ) UpdateCheckConfig::getByName( const OUString& aName )
throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
...@@ -539,28 +475,21 @@ UpdateCheckConfig::getByName( const OUString& aName ) ...@@ -539,28 +475,21 @@ UpdateCheckConfig::getByName( const OUString& aName )
if( aStr.isEmpty() ) if( aStr.isEmpty() )
aValue = uno::makeAny(getDesktopDirectory()); aValue = uno::makeAny(getDesktopDirectory());
} }
return aValue; return aValue;
} }
uno::Sequence< OUString > SAL_CALL uno::Sequence< OUString > SAL_CALL
UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException, std::exception) UpdateCheckConfig::getElementNames() throw (uno::RuntimeException, std::exception)
{ {
return m_xContainer->getElementNames(); return m_xContainer->getElementNames();
} }
sal_Bool SAL_CALL sal_Bool SAL_CALL
UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception)
{ {
return m_xContainer->hasByName( aName ); return m_xContainer->hasByName( aName );
} }
void SAL_CALL void SAL_CALL
UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement ) UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement )
throw (lang::IllegalArgumentException, container::NoSuchElementException, throw (lang::IllegalArgumentException, container::NoSuchElementException,
...@@ -569,7 +498,6 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen ...@@ -569,7 +498,6 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen
return m_xContainer->replaceByName( aName, aElement ); return m_xContainer->replaceByName( aName, aElement );
} }
// XChangesBatch // XChangesBatch
void SAL_CALL void SAL_CALL
...@@ -616,8 +544,6 @@ UpdateCheckConfig::commitChanges() ...@@ -616,8 +544,6 @@ UpdateCheckConfig::commitChanges()
} }
} }
sal_Bool SAL_CALL sal_Bool SAL_CALL
UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exception) UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exception)
{ {
...@@ -628,8 +554,6 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exce ...@@ -628,8 +554,6 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exce
return sal_False; return sal_False;
} }
uno::Sequence< util::ElementChange > SAL_CALL uno::Sequence< util::ElementChange > SAL_CALL
UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exception) UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exception)
{ {
...@@ -640,7 +564,6 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exce ...@@ -640,7 +564,6 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exce
return uno::Sequence< util::ElementChange >(); return uno::Sequence< util::ElementChange >();
} }
bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName, bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
const OUString& rVersion ) const OUString& rVersion )
{ {
...@@ -671,7 +594,6 @@ bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName, ...@@ -671,7 +594,6 @@ bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
return bNotify; return bNotify;
} }
bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
const OUString& rVersion ) const OUString& rVersion )
{ {
...@@ -704,7 +626,6 @@ bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, ...@@ -704,7 +626,6 @@ bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
return false; return false;
} }
OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
sal_Int32 *nIndex ) sal_Int32 *nIndex )
{ {
...@@ -716,9 +637,7 @@ OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, ...@@ -716,9 +637,7 @@ OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
return rVersion.getToken( 0, '.', *nIndex ); return rVersion.getToken( 0, '.', *nIndex );
} }
/// checks if the second version string is greater than the first one
// checks if the second version string is greater than the first one
bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
const OUString& rVersion2 ) const OUString& rVersion2 )
{ {
...@@ -740,10 +659,6 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, ...@@ -740,10 +659,6 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
return false; return false;
} }
OUString SAL_CALL OUString SAL_CALL
UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException, std::exception) UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException, std::exception)
{ {
...@@ -757,13 +672,10 @@ UpdateCheckConfig::supportsService(OUString const & serviceName) ...@@ -757,13 +672,10 @@ UpdateCheckConfig::supportsService(OUString const & serviceName)
return cppu::supportsService(this, serviceName); return cppu::supportsService(this, serviceName);
} }
uno::Sequence< OUString > SAL_CALL uno::Sequence< OUString > SAL_CALL
UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
{ {
return getServiceNames(); return getServiceNames();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/source/update/feed/updatefeed.cxx
Dosyayı görüntüle @ c082bf7a
...@@ -367,7 +367,6 @@ UpdateInformationProvider::UpdateInformationProvider( ...@@ -367,7 +367,6 @@ UpdateInformationProvider::UpdateInformationProvider(
} }
} }
uno::Reference< uno::XInterface > uno::Reference< uno::XInterface >
UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentContext>& xContext) UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment