diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-07-27 23:53:18 +0800 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-09-04 01:35:01 +0000 |
| commit | 382bdb8ea1a1aca10752e9124f4fb6bef9e755c8 (patch) | |
| tree | 36b080cd2ce978a154936258a22ffd6dc63f079f /oox | |
| parent | 176927f2f68ae1dd3be1a387896b11b59a5f67b4 (diff) | |
Replace bullet char before write out font description
since it may be altered if bullet font has been changed
(i.e. StarSymbol to WingDings ).
Change-Id: I0461cc0a5e4628b36177602bba7ed7f74a0751eb
Reviewed-on: https://gerrit.libreoffice.org/17376
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/18318
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index c06d5e542412..da384747efbd 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1746,10 +1746,14 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa mpFS->singleElementNS( XML_a, XML_buSzPct, XML_val, IS( std::max( (sal_Int32)25000, std::min( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND ); if( bHasFontDesc ) + { + if ( SVX_NUM_CHAR_SPECIAL == nNumberingType ) + aBulletChar = SubstituteBullet( aBulletChar, aFontDesc ); mpFS->singleElementNS( XML_a, XML_buFont, XML_typeface, aFontDesc.Name.toUtf8().getStr(), XML_charset, (aFontDesc.CharSet == awt::CharSet::SYMBOL) ? "2" : NULL, FSEND ); + } OUString pAutoNumType = GetAutoNumType( nNumberingType, bSDot, bPBehind, bPBoth ); @@ -1762,7 +1766,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa } else { - aBulletChar = SubstituteBullet( aBulletChar, aFontDesc ); mpFS->singleElementNS(XML_a, XML_buChar, XML_char, USS( OUString( aBulletChar ) ), FSEND); } } |