summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToma┼ż Vajngerl <tomaz.vajngerl@collabora.com>2014-08-28 13:32:38 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-08-29 03:24:44 -0500
commiteed9b96cd65816f2f03b3ad00994d26d6a3cf783 (patch)
tree4e721a50a02c287de2f9d964168803de7646d613
parenta02f846aac48eddca5e9a7d8d841a11bca6d8a9d (diff)
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/11181 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--oox/source/export/drawingml.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fe55aa8dea2b..2ef0d1fa6928 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1458,7 +1458,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;
@@ -1520,6 +1520,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 ) {