diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-09 09:55:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-10 12:59:38 +0200 |
| commit | e4ff847fe0796420ba8023b70cad8589f5f19e9f (patch) | |
| tree | 136786200de69f70dde4190c9725f35fe14b33e0 /vcl/source/image/ImplImageTree.cxx | |
| parent | 5a89496ffcfcd561b3e595e01f35e0302fa00841 (diff) | |
loplugin:stringview check for getToken and trim
since we now have o3tl versions of those that work on
string_view.
Also improve those o3tl functions to support both string_view
and u16string_view
Change-Id: Iacab2996becec62aa78a5597c52d983bb784749a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132755
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/image/ImplImageTree.cxx')
| -rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index a54514eb4b2e..4c2e63c57cae 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -56,6 +56,7 @@ #include <vcl/pngwrite.hxx> #include <bitmap/BitmapLightenFilter.hxx> +#include <o3tl/string_view.hxx> using namespace css; @@ -593,8 +594,8 @@ void ImplImageTree::parseLinkFile(std::shared_ptr<SvStream> const & xStream) continue; sal_Int32 nIndex = 0; - aLink = OStringToOUString(aLine.getToken(0, ' ', nIndex), RTL_TEXTENCODING_UTF8); - aOriginal = OStringToOUString(aLine.getToken(0, ' ', nIndex), RTL_TEXTENCODING_UTF8); + aLink = OStringToOUString(o3tl::getToken(aLine, 0, ' ', nIndex), RTL_TEXTENCODING_UTF8); + aOriginal = OStringToOUString(o3tl::getToken(aLine, 0, ' ', nIndex), RTL_TEXTENCODING_UTF8); // skip comments, or incomplete entries if (aLink.isEmpty() || aLink[0] == '#' || aOriginal.isEmpty()) |