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

[Tomaž Vajngerl]

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

New commits:
commit b51e8ee475832e20901d6dafb40b28c44582a3f3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Thu Aug 28 13:32:38 2014 +0200

    bnc#822347: if number type is not set, skip numbering
    
    If numbering is detected then (level is > 0) and the number type
    is not set, the defult bullet symbol is written. This is not
    correct as the default should be SVX_NUM_NUMBER_NONE which should
    skip numbering or set it to none. With this change the numbering
    is skipped (as in MSO).
    
    (cherry picked from commit 14fa2698f2f651343675761e75be01b84c4c5ff1)
    
    Conflicts:
    	oox/source/export/drawingml.cxx
    
    Change-Id: I8d08a6325509c7bd6f96f64c8d29e5f3045458ca
    Reviewed-on: https://gerrit.libreoffice.org/11180
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 847d21c..aa7735f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1063,7 +1063,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
 
             if ( nPropertyCount ) {
 
-                sal_Int16 nNumberingType = -1;
+                sal_Int16 nNumberingType = SVX_NUM_NUMBER_NONE;
                 bool bSDot = false;
                 bool bPBehind = false;
                 bool bPBoth = false;
@@ -1125,6 +1125,9 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
                     }
                 }
 
+                if (nNumberingType == SVX_NUM_NUMBER_NONE)
+                    return;
+
                 const char* pAutoNumType = GetAutoNumType( nNumberingType, bSDot, bPBehind, bPBoth );
 
                 if( nLevel >= 0 ) {