diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 10:34:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 18:38:44 +0200 |
| commit | 8898955456ce6a6dc0ce9401ee05ce9d04e13668 (patch) | |
| tree | 64abb308b5d33f2c536106fff8d021141879502a /cui | |
| parent | 4e4de8935f38b781374ca34408bd3c57c3cdb69f (diff) | |
Related: tdf#132970 handle more places with potentially utf16 bullets
Change-Id: Iac6b319700d610b5a1debff0a633172b2411c40e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103161
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a51ed1f32b6b..211b131f3f9c 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -534,10 +534,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) const ACFlags nFlags = pAutoCorrect->GetFlags(); aBulletFont = pOpt->aBulletFont; - sBulletChar = OUString(pOpt->cBullet); + sBulletChar = OUString(&pOpt->cBullet, 1); aByInputBulletFont = pOpt->aByInputBulletFont; - sByInputBulletChar = OUString( pOpt->cByInputBullet ); + sByInputBulletChar = OUString(&pOpt->cByInputBullet, 1); nPercent = pOpt->nRightMargin; sMargin = unicode::formatPercent(nPercent, Application::GetSettings().GetUILanguageTag()); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 141021652ac4..4eb04ec24b40 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -688,8 +688,9 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) else aFmt.SetBulletFont( &rActBulletFont ); + sal_Int32 nIndexUtf16 = 0; aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty() - ? pLevelSettings->sBulletChar[0] + ? pLevelSettings->sBulletChar.iterateCodePoints(&nIndexUtf16) : 0 ); aFmt.SetCharFormatName( sBulletCharFormatName ); aFmt.SetBulletRelSize(45); |