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 -*-
#
#
# This file is part of the LibreOffice project.
#
# 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
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(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 -*-
#
#
# This file is part of the LibreOffice project.
#
# 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
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(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 -*-
#
#
# This file is part of the LibreOffice project.
#
# 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
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(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[] = {
static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties);
NamedValueByNameAccess::~NamedValueByNameAccess()
{
}
css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName)
{
const sal_Int32 nLen = m_rValues.getLength();
......@@ -99,25 +95,18 @@ css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName)
return css::uno::Any();
}
bool
UpdateCheckROModel::isAutoCheckEnabled() const
{
return m_aNameAccess.getValue(AUTOCHECK_ENABLED).get<bool>();
}
bool
UpdateCheckROModel::isDownloadPaused() const
{
return m_aNameAccess.getValue(DOWNLOAD_PAUSED).get<bool>();
}
OUString
UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
{
......@@ -129,15 +118,11 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
return aRet;
}
OUString UpdateCheckROModel::getLocalFileName() const
{
return getStringValue(LOCAL_FILE);
};
sal_Int64 UpdateCheckROModel::getDownloadSize() const
{
uno::Any aAny( m_aNameAccess.getValue(DOWNLOAD_SIZE) );
......@@ -147,16 +132,12 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const
return nRet;
};
OUString
UpdateCheckROModel::getUpdateEntryVersion() const
{
return getStringValue(OLD_VERSION);
}
void
UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
{
......@@ -179,9 +160,6 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
}
}
OUString UpdateCheckConfig::getDesktopDirectory()
{
OUString aRet;
......@@ -209,8 +187,6 @@ OUString UpdateCheckConfig::getDesktopDirectory()
return aRet;
}
OUString UpdateCheckConfig::getAllUsersDirectory()
{
OUString aRet;
......@@ -230,7 +206,6 @@ OUString UpdateCheckConfig::getAllUsersDirectory()
return aRet;
}
UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer,
const uno::Reference<container::XNameContainer>& xAvailableUpdates,
const uno::Reference<container::XNameContainer>& xIgnoredUpdates,
......@@ -241,12 +216,9 @@ UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameConta
m_rListener( rListener )
{}
UpdateCheckConfig::~UpdateCheckConfig()
{}
::rtl::Reference< UpdateCheckConfig >
UpdateCheckConfig::get(
const uno::Reference<uno::XComponentContext>& xContext,
......@@ -278,8 +250,6 @@ UpdateCheckConfig::get(
return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
}
bool
UpdateCheckConfig::isAutoCheckEnabled() const
{
......@@ -288,8 +258,6 @@ UpdateCheckConfig::isAutoCheckEnabled() const
return nValue;
}
bool
UpdateCheckConfig::isAutoDownloadEnabled() const
{
......@@ -298,8 +266,6 @@ UpdateCheckConfig::isAutoDownloadEnabled() const
return nValue;
}
OUString
UpdateCheckConfig::getUpdateEntryVersion() const
{
......@@ -311,8 +277,6 @@ UpdateCheckConfig::getUpdateEntryVersion() const
return aValue;
}
sal_Int64
UpdateCheckConfig::getLastChecked() const
{
......@@ -324,8 +288,6 @@ UpdateCheckConfig::getLastChecked() const
return nValue;
}
sal_Int64
UpdateCheckConfig::getCheckInterval() const
{
......@@ -337,8 +299,6 @@ UpdateCheckConfig::getCheckInterval() const
return nValue;
}
OUString
UpdateCheckConfig::getLocalFileName() const
{
......@@ -351,8 +311,6 @@ UpdateCheckConfig::getLocalFileName() const
return aRet;
}
OUString
UpdateCheckConfig::getDownloadDestination() const
{
......@@ -364,8 +322,6 @@ UpdateCheckConfig::getDownloadDestination() const
return aRet;
}
void
UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize)
{
......@@ -384,8 +340,6 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64
commitChanges();
}
void
UpdateCheckConfig::clearLocalFileName()
{
......@@ -401,8 +355,6 @@ UpdateCheckConfig::clearLocalFileName()
commitChanges();
}
void
UpdateCheckConfig::storeDownloadPaused(bool paused)
{
......@@ -410,8 +362,6 @@ UpdateCheckConfig::storeDownloadPaused(bool paused)
commitChanges();
}
void
UpdateCheckConfig::updateLastChecked()
{
......@@ -423,8 +373,6 @@ UpdateCheckConfig::updateLastChecked()
replaceByName(LAST_CHECK, uno::makeAny(lastCheck));
}
void
UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild)
......@@ -460,8 +408,6 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC
commitChanges();
}
void
UpdateCheckConfig::clearUpdateFound()
{
......@@ -489,8 +435,6 @@ UpdateCheckConfig::clearUpdateFound()
commitChanges();
}
uno::Sequence< OUString >
UpdateCheckConfig::getServiceNames()
{
......@@ -498,32 +442,24 @@ UpdateCheckConfig::getServiceNames()
return aServiceList;
}
OUString
UpdateCheckConfig::getImplName()
{
return OUString("vnd.sun.UpdateCheckConfig");
}
uno::Type SAL_CALL
UpdateCheckConfig::getElementType() throw (uno::RuntimeException, std::exception)
{
return m_xContainer->getElementType();
}
sal_Bool SAL_CALL
UpdateCheckConfig::hasElements() throw (uno::RuntimeException, std::exception)
{
return m_xContainer->hasElements();
}
uno::Any SAL_CALL
UpdateCheckConfig::getByName( const OUString& aName )
throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
......@@ -539,28 +475,21 @@ UpdateCheckConfig::getByName( const OUString& aName )
if( aStr.isEmpty() )
aValue = uno::makeAny(getDesktopDirectory());
}
return aValue;
}
uno::Sequence< OUString > SAL_CALL
UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException, std::exception)
UpdateCheckConfig::getElementNames() throw (uno::RuntimeException, std::exception)
{
return m_xContainer->getElementNames();
}
sal_Bool SAL_CALL
UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception)
{
return m_xContainer->hasByName( aName );
}
void SAL_CALL
UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement )
throw (lang::IllegalArgumentException, container::NoSuchElementException,
......@@ -569,7 +498,6 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen
return m_xContainer->replaceByName( aName, aElement );
}
// XChangesBatch
void SAL_CALL
......@@ -616,8 +544,6 @@ UpdateCheckConfig::commitChanges()
}
}
sal_Bool SAL_CALL
UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exception)
{
......@@ -628,8 +554,6 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException, std::exce
return sal_False;
}
uno::Sequence< util::ElementChange > SAL_CALL
UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exception)
{
......@@ -640,7 +564,6 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException, std::exce
return uno::Sequence< util::ElementChange >();
}
bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
const OUString& rVersion )
{
......@@ -671,7 +594,6 @@ bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
return bNotify;
}
bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
const OUString& rVersion )
{
......@@ -704,7 +626,6 @@ bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
return false;
}
OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
sal_Int32 *nIndex )
{
......@@ -716,9 +637,7 @@ OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
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,
const OUString& rVersion2 )
{
......@@ -740,10 +659,6 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
return false;
}
OUString SAL_CALL
UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException, std::exception)
{
......@@ -757,13 +672,10 @@ UpdateCheckConfig::supportsService(OUString const & serviceName)
return cppu::supportsService(this, serviceName);
}
uno::Sequence< OUString > SAL_CALL
UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
{
return getServiceNames();
}
/* 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(
}
}
uno::Reference< uno::XInterface >
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