strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the more "natural" string_view o3tl::getToken variant here

Browse source 
Change-Id: I31edc76e4358f7bcedabd89376fe0b28ec73e5f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140343
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-09-21 15:06:30 +02:00
parent 776ea34dee
commit c1ee70dba2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
svl/source/misc/inettype.cxx
View file

@ -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);
}
}