From f57cfddb51b7d7409b7b425dc200aa73406a13bd Mon Sep 17 00:00:00 2001 From: "Attila Bakos (NISZ)" Date: Wed, 8 Dec 2021 10:22:37 +0100 Subject: tdf#145162 PPTX export: fix extra bullet regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Placeholders have bullet by default in MSO, so write 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 Reviewed-by: László Németh --- oox/source/export/drawingml.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'oox') 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; -- cgit