diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 10:49:42 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 11:04:16 +0200 |
commit | 153ea761e32238d1dd882823cf27da1b11c4d66a (patch) | |
tree | 3c0b531049e3071b25d47bc76ece73560c246646 /lotuswordpro/source/filter/lwpsilverbullet.cxx | |
parent | 4dd62d9cc3cb8d79694cb5c1ba09ccf730d211a5 (diff) |
Consistently represent bullet char as OUString
(One difference is that for an XFListLevelBullet for which SetBulletChar has not
been called, ToXml will use an empty string now instead of a string containing a
single NUL character. But given that initializing m_chBullet to zero in the
XFListLevelBullet ctor was only added recently with
72069675955aaf0b72a7842453347e3e7293f56d "coverity#738770: Unitialized scalar
field," assume that ToXml is supposed to be only called after SetBulletChar has
been called.)
Change-Id: I7a5d7496b038cd094ab11ef8cbc1823ffc5bc130
Diffstat (limited to 'lotuswordpro/source/filter/lwpsilverbullet.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpsilverbullet.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 89da8d781fad..3eaae4678f41 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -171,7 +171,7 @@ void LwpSilverBullet::RegisterStyle() aSuffix = aParaNumbering.pSuffix->GetText(); } - pListStyle->SetListBullet(nPos, GetNumCharByStyleID(pParaNumber).toChar(), + pListStyle->SetListBullet(nPos, GetNumCharByStyleID(pParaNumber), "Times New Roman", aPrefix, aSuffix); } @@ -221,11 +221,9 @@ OUString LwpSilverBullet::GetBulletFontName() * @descr: * @return: An UChar32 bulle character. */ -UChar32 LwpSilverBullet::GetBulletChar() +OUString LwpSilverBullet::GetBulletChar() { - OUString aBulletChar = m_pBulletPara->GetBulletChar(); - - return aBulletChar.toChar(); + return m_pBulletPara->GetBulletChar(); } /** |