whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextDocument::toPlainText: avoid unconditional detach 

Let's find replaceable chars and then do detach

Change-Id: I4a4360d73a97af2388f4f2f284949ffcfbc48836
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Anton Kudryavtsev 2023-09-08 13:05:53 +03:00
parent 068f19ea39
commit 20980df293
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/text/qtextdocument.cpp
View File

@ -1200,10 +1200,18 @@ QString QTextDocument::toPlainText() const
Q_D(const QTextDocument);
QString txt = d->plainText();
QChar *uc = txt.data();
QChar *e = uc + txt.size();
constexpr char16_t delims[] = { 0xfdd0, 0xfdd1,
QChar::ParagraphSeparator, QChar::LineSeparator, QChar::Nbsp };
for (; uc != e; ++uc) {
const size_t pos = std::u16string_view(txt).find_first_of(
std::u16string_view(delims, std::size(delims)));
if (pos == std::u16string_view::npos)
return txt;
QChar *uc = txt.data();
QChar *const e = uc + txt.size();
for (uc += pos; uc != e; ++uc) {
switch (uc->unicode()) {
case 0xfdd0: // QTextBeginningOfFrame
case 0xfdd1: // QTextEndOfFrame