ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

editeng: Call unicode::getUnicodeType() on UTF-32 code units

Browse Source 
By using OUString::iterateCodePoints() instead of accessing individual
UTF-16 code units that might be surrogate pairs.

Change-Id: I5e3e513a788f0c939f96b0521fed16fe4848a053
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154875
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
This commit is contained in:
Khaled Hosny
2023-07-25 02:15:05 +02:00
committed by خالد حسني
parent 2e6e40b745
commit 529dce3d5b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editeng/source/editeng/impedit2.cxx
+12 -10
View File
@@ -1732,10 +1732,10 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
{
if ( _xBI->getScriptType( aText, nPos - 1 ) == i18n::ScriptType::WEAK )
{
switch ( u_charType(aText.iterateCodePoints(&nPos, 0) ) ) {
case U_NON_SPACING_MARK:
case U_ENCLOSING_MARK:
case U_COMBINING_SPACING_MARK:
switch (unicode::getUnicodeType(aText.iterateCodePoints(&nPos, 0))) {
case css::i18n::UnicodeType::NON_SPACING_MARK:
case css::i18n::UnicodeType::ENCLOSING_MARK:
case css::i18n::UnicodeType::COMBINING_SPACING_MARK:
--nPos;
rTypes.back().nEndPos--;
break;
@@ -2761,7 +2761,9 @@ EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const OUStrin
sal_Int32 nPos = nMaxNewChars;
while (nPos-- > 0 && (nMaxNewChars - nPos) <= 84)
{
switch (unicode::getUnicodeType(aLine[nPos]))
auto nNextPos = nPos;
const auto c = aLine.iterateCodePoints(&nNextPos);
switch (unicode::getUnicodeType(c))
{
case css::i18n::UnicodeType::UPPERCASE_LETTER:
case css::i18n::UnicodeType::LOWERCASE_LETTER:
@@ -2775,24 +2777,24 @@ EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const OUStrin
break;
default:
{
const sal_Unicode c = aLine[nPos];
// Ignore NO-BREAK spaces, NBSP, NNBSP, ZWNBSP.
if (c == 0x00A0 || c == 0x202F || c == 0xFEFF)
break;
if (c == '-' && nPos + 1 < nMaxNewChars)
const auto n = aLine.iterateCodePoints(&nNextPos, 0);
if (c == '-' && nNextPos < nMaxNewChars)
{
// Keep HYPHEN-MINUS with a number to the right.
const sal_Int16 t = unicode::getUnicodeType(aLine[nPos+1]);
const sal_Int16 t = unicode::getUnicodeType(n);
if ( t == css::i18n::UnicodeType::DECIMAL_DIGIT_NUMBER ||
t == css::i18n::UnicodeType::LETTER_NUMBER ||
t == css::i18n::UnicodeType::OTHER_NUMBER)
nMaxNewChars = nPos; // line break before
else
nMaxNewChars = nPos + 1; // line break after
nMaxNewChars = nNextPos; // line break after
}
else
{
nMaxNewChars = nPos + 1; // line break after
nMaxNewChars = nNextPos; // line break after
}
nPos = 0; // will break loop
}