[Libreoffice-commits] core.git: svl/source

[Stephan Bergmann (via logerrit)]

 svl/source/misc/inettype.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c1ee70dba2c8da567feeeb276fddf5f726863a81
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Sep 21 15:06:30 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Sep 21 16:18:07 2022 +0200

    Use the more "natural" string_view o3tl::getToken variant here
    
    Change-Id: I31edc76e4358f7bcedabd89376fe0b28ec73e5f0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140343
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index ca2528c3c242..d75e856ae880 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -311,8 +311,8 @@ INetContentType 
INetContentTypes::GetContentType4Extension(OUString const & rExt
 INetContentType INetContentTypes::GetContentTypeFromURL(std::u16string_view 
rURL)
 {
     INetContentType eTypeID = CONTENT_TYPE_UNKNOWN;
-    sal_Int32 nIdx{ 0 };
-    OUString aToken( o3tl::getToken(rURL, 0, ':', nIdx) );
+    std::size_t nIdx{ 0 };
+    OUString aToken( o3tl::getToken(rURL, u':', nIdx) );
     if (!aToken.isEmpty())
     {
         if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_FILE))
@@ -342,13 +342,13 @@ INetContentType 
INetContentTypes::GetContentTypeFromURL(std::u16string_view rURL
             eTypeID = CONTENT_TYPE_TEXT_HTML;
         else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_PRIVATE))
         {
-            aToken = o3tl::getToken(rURL, 0, '/', nIdx);
+            aToken = o3tl::getToken(rURL, u'/', nIdx);
             if (aToken == "factory")
             {
-                aToken = o3tl::getToken(rURL, 0, '/', nIdx);
+                aToken = o3tl::getToken(rURL, u'/', nIdx);
                 if (aToken == "swriter")
                 {
-                    aToken = o3tl::getToken(rURL, 0, '/', nIdx);
+                    aToken = o3tl::getToken(rURL, u'/', nIdx);
                     eTypeID = aToken == "web" ?
                                   CONTENT_TYPE_APP_VND_WRITER_WEB :
                               aToken == "GlobalDocument" ?
@@ -379,7 +379,7 @@ INetContentType 
INetContentTypes::GetContentTypeFromURL(std::u16string_view rURL
             eTypeID = CONTENT_TYPE_APP_MACRO;
         else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_DATA))
         {
-            aToken = o3tl::getToken(rURL, 0, ',', nIdx);
+            aToken = o3tl::getToken(rURL, u',', nIdx);
             eTypeID = GetContentType(aToken);
         }
     }