diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2021-11-18 09:05:30 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-11-29 11:37:52 +0100 |
| commit | c22f1ceba99b2ff4fa23728eb8581294e9414016 (patch) | |
| tree | 33994239f5c308932d56a2cb7b86782730782599 /oox | |
| parent | 4300facf4bc6fe0d9765db56720ced99c564caa2 (diff) | |
tdf#118045 PPTX export: fix proportional line spacing
If line spacing differs from the default 100%, export it
as direct paragraph formatting (similar to the
other paragraph style properties).
Change-Id: Id5db9ae36018c8a20b832470685bdfbba19d80f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125438
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 5db7694a6377d32bdef293b4ece27b471c3ea427)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125992
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index af96b14f1ac6..fbe13359dd9b 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2877,8 +2877,11 @@ bool DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara bool bHasLinespacing = false; LineSpacing aLineSpacing; if (GetPropertyAndState(rXPropSet, rXPropState, "ParaLineSpacing", eState) - && eState == beans::PropertyState_DIRECT_VALUE) - bHasLinespacing = ( mAny >>= aLineSpacing ); + && (mAny >>= aLineSpacing) + && (eState == beans::PropertyState_DIRECT_VALUE || + // only export if it differs from the default 100% line spacing + aLineSpacing.Mode != LineSpacingMode::PROP || aLineSpacing.Height != 100)) + bHasLinespacing = true; bool bRtl = false; if (GetProperty(rXPropSet, "WritingMode")) |