diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-21 20:44:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 12:52:28 +0200 |
| commit | be8a33c0f03b83357d2ae37dda6bf65313267cea (patch) | |
| tree | 83aa385e23e1f4deda8858c68d59d61c2a6342cc /include/editeng | |
| parent | 17ca11125f1639d87d31237af822767dd38d31e7 (diff) | |
tdf#132970 SMP bullets mangled
working:
a) bullet preview
b) writer rendering
c) save to odt
a) load from odt
Change-Id: I2f85576389fe4f0437f81799c14dfd98c8c40b2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103129
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/numitem.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 38dbfe90370a..46b34bd41abe 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -30,6 +30,7 @@ #include <unotools/fontcvt.hxx> #include <editeng/editengdllapi.h> #include <o3tl/typed_flags_set.hxx> +#include <vcl/vclenum.hxx> #include <memory> #include <optional> #include <algorithm> @@ -113,7 +114,7 @@ private: sal_uInt8 nInclUpperLevels; // Take over numbers from the previous level. sal_uInt16 nStart; // Start of counting - sal_Unicode cBullet; // Symbol + sal_UCS4 cBullet; // Symbol sal_uInt16 nBulletRelSize; // percentage size of bullets Color nBulletColor; // Bullet color @@ -180,8 +181,8 @@ public: void SetBulletFont(const vcl::Font* pFont); const vcl::Font* GetBulletFont() const {return pBulletFont.get();} - void SetBulletChar(sal_Unicode cSet){cBullet = cSet;} - sal_Unicode GetBulletChar()const {return cBullet;} + void SetBulletChar(sal_UCS4 cSet){cBullet = cSet;} + sal_UCS4 GetBulletChar()const {return cBullet;} void SetBulletRelSize(sal_uInt16 nSet) {nBulletRelSize = std::max(nSet,sal_uInt16(SVX_NUM_REL_SIZE_MIN));} sal_uInt16 GetBulletRelSize() const { return nBulletRelSize;} void SetBulletColor(Color nSet){nBulletColor = nSet;} |