summaryrefslogtreecommitdiff
path: root/oox/source/export
diff options
context:
space:
mode:
authorAttila Bakos (NISZ) <bakos.attilakaroly@nisz.hu>2021-12-08 10:22:37 +0100
committerLászló Németh <nemeth@numbertext.org>2021-12-09 12:14:51 +0100
commitf57cfddb51b7d7409b7b425dc200aa73406a13bd (patch)
tree61cdfc34abc863e9c18bf35bb1c27820b4566414 /oox/source/export
parent47aabde053a1472dc32770da29d68c8de5bd7919 (diff)
tdf#145162 PPTX export: fix extra bullet regression
Placeholders have bullet by default in MSO, so write <a:buNone/> for paragraphs where numbering/bullet is disabled to avoid extra bullets in Impress. Regression from commit b6b02e0b4c9d739836e1f61a886ea45b01e6696e (tdf#111903 tdf#137152 PPTX export: fix placeholders). Change-Id: Ib4c563cba475d61bc475ca05623e7c7b20fded30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126528 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox/source/export')
-rw-r--r--oox/source/export/drawingml.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 249c897740a9..8581535357a0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2613,7 +2613,13 @@ static OUString GetAutoNumType(SvxNumType nNumberingType, bool bSDot, bool bPBeh
void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropSet, float fFirstCharHeight, sal_Int16 nLevel )
{
if (nLevel < 0 || !GetProperty(rXPropSet, "NumberingRules"))
+ {
+ if (GetDocumentType() == DOCUMENT_PPTX)
+ {
+ mpFS->singleElementNS(XML_a, XML_buNone);
+ }
return;
+ }
Reference< XIndexAccess > rXIndexAccess;