diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2019-02-09 18:13:04 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2019-02-13 07:44:13 +0100 |
| commit | bd0ba6d459d9da09038db93bf701135273a429df (patch) | |
| tree | d909087bb4fb8a98c00d1aae58c487dda39dbb4e /svl | |
| parent | f4a75a254dbc172e07cac18b7bb8edc965f378d7 (diff) | |
Use indexed getToken()
Change-Id: I7a9ee6cb1e5fd9dac917d236bfd612100828c087
Reviewed-on: https://gerrit.libreoffice.org/67626
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/inettype.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 2704d949a8d5..f2bdd6c8f2f9 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -317,7 +317,8 @@ INetContentType INetContentTypes::GetContentType4Extension(OUString const & rExt INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) { INetContentType eTypeID = CONTENT_TYPE_UNKNOWN; - OUString aToken = rURL.getToken(0, ':'); + sal_Int32 nIdx{ 0 }; + OUString aToken = rURL.getToken(0, ':', nIdx); if (!aToken.isEmpty()) { if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_FILE)) @@ -347,14 +348,13 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) eTypeID = CONTENT_TYPE_TEXT_HTML; else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_PRIVATE)) { - OUString aSecondPart = rURL.getToken(1, ':'); - aToken = aSecondPart.getToken(0, '/'); + aToken = rURL.getToken(0, '/', nIdx); if (aToken == "factory") { - aToken = aSecondPart.getToken(1, '/'); + aToken = rURL.getToken(0, '/', nIdx); if (aToken == "swriter") { - aToken = aSecondPart.getToken(2, '/'); + aToken = rURL.getToken(0, '/', nIdx); eTypeID = aToken == "web" ? CONTENT_TYPE_APP_VND_WRITER_WEB : aToken == "GlobalDocument" ? @@ -385,8 +385,7 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) eTypeID = CONTENT_TYPE_APP_MACRO; else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_DATA)) { - OUString aSecondPart = rURL.getToken(1, ':'); - aToken = aSecondPart.getToken(0, ','); + aToken = rURL.getToken(0, ',', nIdx); eTypeID = GetContentType(aToken); } } |