diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-28 17:56:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 16:42:33 +0100 |
| commit | 042033f1e6da22616cb76c8d950c20c9efecbad5 (patch) | |
| tree | 26b3f1f42d067506f44550b410f3fb9640616a5b /vcl/source/image | |
| parent | ccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff) | |
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/image')
| -rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 6a9cd8f75628..92ef534467dc 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -99,12 +99,12 @@ OUString convertLcTo32Path(OUString const & rPath) return aResult; } -OUString createPath(std::u16string_view name, sal_Int32 pos, OUString const & locale) +OUString createPath(std::u16string_view name, sal_Int32 pos, std::u16string_view locale) { - return name.substr(0, pos + 1) + locale + name.substr(pos); + return OUString::Concat(name.substr(0, pos + 1)) + locale + name.substr(pos); } -OUString getIconCacheUrl(OUString const & sVariant, ImageRequestParameters const & rParameters) +OUString getIconCacheUrl(std::u16string_view sVariant, ImageRequestParameters const & rParameters) { OUString sUrl = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/" + rParameters.msStyle + "/" + sVariant + "/" + rParameters.msName; @@ -112,7 +112,8 @@ OUString getIconCacheUrl(OUString const & sVariant, ImageRequestParameters const return sUrl; } -OUString createIconCacheUrl(OUString const & sVariant, ImageRequestParameters const & rParameters) +OUString createIconCacheUrl( + std::u16string_view sVariant, ImageRequestParameters const & rParameters) { OUString sUrl(getIconCacheUrl(sVariant, rParameters)); OUString sDir = sUrl.copy(0, sUrl.lastIndexOf('/')); @@ -359,7 +360,7 @@ OUString createVariant(ImageRequestParameters& rParameters) return aVariant; } -bool loadDiskCachedVersion(OUString const & sVariant, ImageRequestParameters& rParameters) +bool loadDiskCachedVersion(std::u16string_view sVariant, ImageRequestParameters& rParameters) { OUString sUrl(getIconCacheUrl(sVariant, rParameters)); if (!urlExists(sUrl)) @@ -370,7 +371,7 @@ bool loadDiskCachedVersion(OUString const & sVariant, ImageRequestParameters& rP return true; } -void cacheBitmapToDisk(OUString const & sVariant, ImageRequestParameters const & rParameters) +void cacheBitmapToDisk(std::u16string_view sVariant, ImageRequestParameters const & rParameters) { OUString sUrl(createIconCacheUrl(sVariant, rParameters)); vcl::PNGWriter aWriter(rParameters.mrBitmap); |