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 /editeng | |
| parent | tdf#121323 avoid assert about duplicate listeners (diff) | |
| download | core-8898955456ce6a6dc0ce9401ee05ce9d04e13668.tar.gz core-8898955456ce6a6dc0ce9401ee05ce9d04e13668.zip | |
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 'editeng')
| -rw-r--r-- | editeng/source/uno/unonrule.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 57b68a0de1d3..03b766d446d7 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -206,7 +206,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType()) { - sal_Unicode nCode = rFmt.GetBulletChar(); + sal_UCS4 nCode = rFmt.GetBulletChar(); OUString aStr( &nCode, 1 ); aVal <<= aStr; beans::PropertyValue aBulletProp( "BulletChar", -1, aVal, beans::PropertyState_DIRECT_VALUE); @@ -324,7 +324,8 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert { if(!aStr.isEmpty()) { - aFmt.SetBulletChar(aStr[0]); + sal_Int32 nIndexUtf16 = 0; + aFmt.SetBulletChar(aStr.iterateCodePoints(&nIndexUtf16)); } else { |