[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - oox/source

[Mark Hung]

 oox/source/export/drawingml.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 84892a9dc80917c1ca45c6eed356bfb38e8b81fb
Author: Mark Hung <marklh9 at gmail.com>
Date:   Mon Jul 27 23:53:18 2015 +0800

    Fix tdf#77881,tdf#80520,tdf#89525 bulllets lost issue.
    
    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 at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/18318
    Reviewed-by: Mark Hung <marklh9 at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/19937
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index efe6323..6b593a8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1721,10 +1721,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 );
 
@@ -1736,7 +1740,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);
         }
     }