50d73574b6
69e9925ded"sdext.pdfimport: resolves tdf#104597: RTL script text runs are reversed" andf6004e1c45"tdf#151546: RTL text is reversed (Writer pdfimport)" had introduced two calls to comphelper::string::reverseString into sdext. That function reverts on the basis of individual UTF-16 code units, not on the basis of Unicode code points. And while at least some pre-existing callers of that function want the former semantics (see below), these two new callers in sdext apparently want the latter semantics. Therefore, introduce an additional function comphelper::string::reverseCodePoints with the latter semantics. I identified three other places that call comphelper::string::reverseString: * SbRtl_StrReverse in basic/source/runtime/methods1.cxx apparently implements some StrReverse Basic function, where a (presumably non-existing) Basic spec would need to decide which of the two semantics is called for. So leave it alone for now. * SvtFileDialog::IsolateFilterFromPath_Impl in fpicker/source/office/iodlg.cxx reverts a string, operates on it, then reverts (parts of) it back. Whether or not that is the most elegant code, using the latter semantics here would apparently be wrong, as double invocation of comphelper::string::reverseCodePoints is not idempotent when the input is a malformed sequence of UTF-16 code units containing a low surrogate followed by a high surrogate. * AccessibleCell::getCellName in svx/source/table/accessiblecell.cxx apparently always operates on a string consisting only of Latin uppercase letters A--Z, for which both semantics are equivalent. (So we can just as well stick with the simpler comphelper::string::reverseString here.) (Extending the tests in comphelper/qa/string/test_string.cxx ran into an issue where loplugin:stringliteralvar warns about deliberate uses of sal_Unicode arrays rather than UTF-16 string literals wrapped in OUStringLiteral, as those arrays deliberately contain malformed UTF-16 code unit sequences and thus converting them into UTF-16 string literals might be considered inappropriate, see the newly added comment at StringLiteralVar::isPotentiallyInitializedWithMalformedUtf16 in compilerplugins/clang/stringliteralvar.cxx for details. So that loplugin had to be improved here, too.) Change-Id: I641cc32c76b0c5f6339ae44d8aa85df0022ffb05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142949 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
135 lines
5.5 KiB
C++
135 lines
5.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <iterator>
|
|
#include <vector>
|
|
|
|
#include <rtl/ustring.hxx>
|
|
|
|
// expected-error-re@+1 {{change type of variable 'literal1' from constant character array ('const char{{ ?}}[4]') to OStringLiteral [loplugin:stringliteralvar]}}
|
|
char const literal1[] = "foo";
|
|
OString f1()
|
|
{
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OString' constructor here [loplugin:stringliteralvar]}}
|
|
return literal1;
|
|
}
|
|
|
|
void f(OUString const&);
|
|
void f2()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
|
|
char const literal[] = "foo";
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
struct S3
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static constexpr char16_t literal[] = u"foo";
|
|
};
|
|
void f3()
|
|
{
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(S3::literal);
|
|
}
|
|
|
|
std::vector<OUString> f4()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static constexpr char16_t literal[] = u"foo";
|
|
// expected-note@+1 {{first passed into a 'rtl::OUString' constructor here [loplugin:stringliteralvar]}}
|
|
return { literal };
|
|
}
|
|
|
|
void f5()
|
|
{
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
|
|
OUStringLiteral const literal = u"foo";
|
|
// expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
void f6()
|
|
{
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
|
|
constexpr OUStringLiteral literal = u"foo";
|
|
// expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
void f7()
|
|
{
|
|
static constexpr OUStringLiteral const literal = u"foo";
|
|
f(literal);
|
|
}
|
|
|
|
void f8()
|
|
{
|
|
static constexpr OUStringLiteral const literal = u"foo";
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} suspiciously used in a sizeof expression [loplugin:stringliteralvar]}}
|
|
(void)sizeof literal;
|
|
}
|
|
|
|
void f9()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const literal[] = { 'f', 'o', 'o' };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(literal, std::size(literal)));
|
|
}
|
|
|
|
void f10()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const literal[] = { 'f', 'o', 'o' };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(literal, 3));
|
|
}
|
|
|
|
void f11(int nStreamType)
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'sDocumentType' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
|
|
const char sDocumentType[] = "foo";
|
|
OUString sStreamType;
|
|
switch (nStreamType)
|
|
{
|
|
case 1:
|
|
// expected-note@+1 {{first assigned here [loplugin:stringliteralvar]}}
|
|
sStreamType = sDocumentType;
|
|
break;
|
|
}
|
|
(void)sStreamType;
|
|
}
|
|
|
|
extern sal_Unicode const extarr[1];
|
|
|
|
sal_Unicode init();
|
|
|
|
void f12()
|
|
{
|
|
// Suppress warnings if the array contains a malformed sequence of UTF-16 code units...:
|
|
static sal_Unicode const arr1[] = { 0xD800 };
|
|
f(OUString(arr1, 1));
|
|
// ...Or potentially contains a malformed sequence of UTF-16 code units...:
|
|
f(OUString(extarr, 1));
|
|
sal_Unicode const arr2[] = { init() };
|
|
f(OUString(arr2, 1));
|
|
// ...But generate a warning if the array contains a well-formed sequence of UTF-16 code units
|
|
// containing surrogates:
|
|
// expected-error-re@+1 {{change type of variable 'arr3' from constant character array ('const sal_Unicode{{ ?}}[2]'{{( \(aka 'const char16_t\[2\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const arr3[] = { 0xD800, 0xDC00 };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(arr3, 2));
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|