diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-01-06 14:34:21 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-01-06 19:21:56 +0100 |
commit | 40e98c878b6f6f205943da94d4b5e039231a482f (patch) | |
tree | b12806f4b6ee848ed20b788ab917e8d0668004d7 /cui | |
parent | adfceaf32651f6ef17a9b63906366818b667d6b5 (diff) |
Drop comphelper::string::equals; compare OUString to OUStringChar
In cui/source/tabpages/autocdlg.cxx, use code point-based methods
for comparison with sal_UCS4 values in SvxSwAutoFormatFlags.
Change-Id: If34c981393774d1b8db649f0c29870e1ca6bdfe8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108847
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 380d61123330..e954372e7e84 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -462,13 +462,15 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* ) pOpt->bChgEnumNum = bCheck; bModified |= aBulletFont != pOpt->aBulletFont; pOpt->aBulletFont = aBulletFont; - bModified |= !comphelper::string::equals(sBulletChar, pOpt->cBullet); - pOpt->cBullet = sBulletChar[0]; + bModified |= sBulletChar != OUString(&pOpt->cBullet, 1); + sal_Int32 index = 0; + pOpt->cBullet = sBulletChar.iterateCodePoints(&index); bModified |= aByInputBulletFont != pOpt->aByInputBulletFont; - bModified |= !comphelper::string::equals(sByInputBulletChar, pOpt->cByInputBullet); + bModified |= sByInputBulletChar != OUString(&pOpt->cByInputBullet, 1); pOpt->aByInputBulletFont = aByInputBulletFont; - pOpt->cByInputBullet = sByInputBulletChar[0]; + index = 0; + pOpt->cByInputBullet = sByInputBulletChar.iterateCodePoints(&index); bCheck = m_xCheckLB->get_toggle(MERGE_SINGLE_LINE_PARA, CBCOL_FIRST) == TRISTATE_TRUE; bModified |= pOpt->bRightMargin != bCheck; |