diff options
| author | Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> | 2022-05-26 17:04:54 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-05-31 13:00:38 +0200 |
| commit | 445d4ce232b8e8efaeb2605533fede1b71f52f30 (patch) | |
| tree | 4d9172a07ada471c2dd318ae70fcc03e48b8913b /include/oox | |
| parent | b94275f6d2cb4dc28d1563fd7994251042b6d51a (diff) | |
tdf#147991 PPTX export: fix bullet indent regression
Instead of exporting the inherited master slide indent
values of the placeholders, export 0 indent value for
removed/disabled bullets to fix interoperability.
Regression from commit f57cfddb51b7d7409b7b425dc200aa73406a13bd
"tdf#145162 PPTX export: fix extra bullet regression".
Change-Id: Icbf823adc07f19fd10d1a60da9cff17616a2aef6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135025
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 294319cf43af..455676e9c262 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -163,6 +163,9 @@ protected: css::uno::Reference<css::drawing::XShape> m_xParent; bool mbIsBackgroundDark; + /// True when exporting presentation placeholder shape. + bool mbPlaceholder; + bool GetProperty( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& aName ); bool GetPropertyAndState( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const css::uno::Reference< css::beans::XPropertyState >& rXPropState, @@ -210,7 +213,7 @@ protected: public: DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = nullptr ) - : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ), mbIsBackgroundDark( false ) {} + : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ), mbIsBackgroundDark( false ), mbPlaceholder(false) {} void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; } const ::sax_fastparser::FSHelperPtr& GetFS() const { return mpFS; } ::oox::core::XmlFilterBase* GetFB() { return mpFB; } |