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

fix for o3tl::equalsAscii

Browse source 
from
    commit d15a6560bd
    use more string_view
where the new method was named incorrectly

Change-Id: Ia4513fa67f5bda8b6cb56e3db22df48b5e3c7283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150217
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2023-04-11 10:27:47 +02:00
parent c0e82975c2
commit dd41ea3ec1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comphelper/source/misc/servicedecl.cxx
View file

@ -131,7 +131,7 @@ bool ServiceDecl::supportsService( std::u16string_view name ) const
sal_Int32 nIndex = 0;
do {
std::string_view const token( o3tl::getToken(str, 0, cDelim, nIndex ) );
if (o3tl::equalsAscii(name, token))
if (o3tl::equalsAsciiL(name, token))
return true;
}
while (nIndex >= 0);

2
cppuhelper/source/shlib.cxx
View file

@ -57,7 +57,7 @@ css::uno::Environment cppuhelper::detail::getEnvironment(
for (sal_Int32 i = 0; i != -1;) {
std::string_view imp(o3tl::getToken(imps, 0, ';', i));
//TODO: this assumes UNO_ENV_LOG only contains ASCII characters:
if (o3tl::equalsAscii(implementation, imp))
if (o3tl::equalsAsciiL(implementation, imp))
{
n += ":log";
break;

4
include/o3tl/string_view.hxx
View file

@ -28,8 +28,8 @@ inline bool equalsAscii(std::u16string_view s1, const char* s2)
return rtl_ustr_ascii_compare_WithLength(s1.data(), s1.size(), s2) == 0;
}
// Like OUString::equalsAsciiL
inline bool equalsAscii(std::u16string_view s1, std::string_view s2)
// Like OUString::equalsAsciiL, but for std::u16string_view:
inline bool equalsAsciiL(std::u16string_view s1, std::string_view s2)
{
return rtl_ustr_ascii_shortenedCompare_WithLength(s1.data(), s1.size(), s2.data(), s2.size())
== 0;