summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2016-05-31 01:22:11 +0800
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-07 07:22:13 +0000
commit02a5941c6ea747fa26dcbb27aa45ef9faac9c857 (patch)
tree035e528fe447b343f28d6b8bab4999bff6a11eec /oox
parent212ebeb225fae10db4dbb4c4a1a4f3fd2d100f42 (diff)
tdf#93883 don't add space to empty paragraph when bullet is turned off.
Change-Id: Ia1bad61cb5585dae0501e8cd657fc84bfea60ab2 Reviewed-on: https://gerrit.libreoffice.org/25679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 005ae2fa195bddd1073f3d883cf041d9ac80fad1) Reviewed-on: https://gerrit.libreoffice.org/25984
Diffstat (limited to 'oox')
-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 880351d61bd1..dfa46d7d1699 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1583,6 +1583,9 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun )
sal_Int16 nLevel = -1;
GET( nLevel, NumberingLevel );
+ bool bNumberingIsNumber = true;
+ GET( bNumberingIsNumber, NumberingIsNumber );
+
bool bIsURLField = false;
OUString sFieldValue = GetFieldValue( rRun, bIsURLField );
bool bWriteField = !( sFieldValue.isEmpty() || bIsURLField );
@@ -1590,7 +1593,7 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun )
OUString sText = rRun->getString();
//if there is no text following the bullet, add a space after the bullet
- if (nLevel !=-1 && sText.isEmpty() )
+ if (nLevel !=-1 && bNumberingIsNumber && sText.isEmpty() )
sText=" ";
if ( bIsURLField )