diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-25 18:56:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-27 10:10:52 +0200 |
| commit | f3049f68584811bb897873f35e0c302898af2d31 (patch) | |
| tree | b77f8bee3f733b8f2565a64276e33387576a26ac /desktop | |
| parent | 28fc0962b10519ab84654d189d2ad0cca8f84f95 (diff) | |
loplugin:constantparam
Change-Id: I966dcf87be021520e7cc394338b9c0574bb8afee
Reviewed-on: https://gerrit.libreoffice.org/53541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/inc/dp_update.hxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_informationprovider.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_update.cxx | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index 390fb0c6ee87..107857dbeb31 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -125,11 +125,10 @@ UpdateInfoMap getOnlineUpdateInfos( std::vector< std::pair< css::uno::Reference< css::deployment::XPackage>, css::uno::Any> > & out_errors); -/* retunrs the highest version from the provided arguments. +/* returns the highest version from the provided arguments. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getHighestVersion( - OUString const & userVersion, OUString const & sharedVersion, OUString const & bundledVersion, OUString const & onlineVersion); diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index c95fc229973d..5088c2e63e95 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -237,10 +237,10 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) OUString updateVersionShared; if (sourceUser != dp_misc::UPDATE_SOURCE_NONE) updateVersionUser = dp_misc::getHighestVersion( - OUString(), sVersionShared, sVersionBundled, sOnlineVersion); + sVersionShared, sVersionBundled, sOnlineVersion); if (sourceShared != dp_misc::UPDATE_SOURCE_NONE) updateVersionShared = dp_misc::getHighestVersion( - OUString(), OUString(), sVersionBundled, sOnlineVersion); + OUString(), sVersionBundled, sOnlineVersion); OUString updateVersion; if (dp_misc::compareVersions(updateVersionUser, updateVersionShared) == dp_misc::GREATER) updateVersion = updateVersionUser; diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 605ace6a5f44..05b23c9cd3f5 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -387,15 +387,13 @@ UpdateInfoMap getOnlineUpdateInfos( return infoMap; } OUString getHighestVersion( - OUString const & userVersion, OUString const & sharedVersion, OUString const & bundledVersion, OUString const & onlineVersion) { - int index = determineHighestVersion(userVersion, sharedVersion, bundledVersion, onlineVersion); + int index = determineHighestVersion(OUString(), sharedVersion, bundledVersion, onlineVersion); switch (index) { - case 0: return userVersion; case 1: return sharedVersion; case 2: return bundledVersion; case 3: return onlineVersion; |