diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-28 14:12:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-29 08:53:22 +0200 |
| commit | d3849255b76e92a42f653c266b88945708984c4f (patch) | |
| tree | ff1eab21b9e5a1ea00e1573db4b4595ba51b0098 /desktop | |
| parent | f9b6bd6336b35de060f6f5bdd91517caf5e9a56e (diff) | |
use more string_view in INetURLObject
Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/migration.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/migration/migration_impl.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 6014d0e74935..0fbca8565634 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -429,7 +429,7 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir) void MigrationImpl::setInstallInfoIfExist( install_info& aInfo, - const OUString& rConfigDir, + std::u16string_view rConfigDir, const OUString& rVersion) { OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::DecodeMechanism::NONE)); @@ -470,11 +470,11 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) ( aInfo.userdata.isEmpty() || aProfileName.equalsIgnoreAsciiCase( utl::ConfigManager::getProductName() ) ) ) { - setInstallInfoIfExist(aInfo, aTopConfigDir + aProfileName, aVersion); + setInstallInfoIfExist(aInfo, OUStringConcatenation(aTopConfigDir + aProfileName), aVersion); #if defined UNX && ! defined MACOSX //try preXDG path if the new one does not exist if ( aInfo.userdata.isEmpty()) - setInstallInfoIfExist(aInfo, aPreXDGTopConfigDir + aProfileName, aVersion); + setInstallInfoIfExist(aInfo, OUStringConcatenation(aPreXDGTopConfigDir + aProfileName), aVersion); #endif } } diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index cf2d201d22e6..d06657588e07 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -159,7 +159,7 @@ private: #if defined UNX && ! defined MACOSX static OUString preXDGConfigDir(const OUString& rConfigDir); #endif - static void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion); + static void setInstallInfoIfExist(install_info& aInfo, std::u16string_view rConfigDir, const OUString& rVersion); static install_info findInstallation(const strings_v& rVersions); strings_vr compileFileList(); |