From fabf1247b4d8091f384f64a89e67cd7049f41d4b Mon Sep 17 00:00:00 2001 From: "Attila Bakos (NISZ)" Date: Wed, 16 Feb 2022 16:09:00 +0100 Subject: tdf#147121 PPTX: fix regression of font size export of empty lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the empty line has got direct formatted font size, don't forget to export it, unless the master setting is applied. Regression from commit b6b02e0b4c9d739836e1f61a886ea45b01e6696e "tdf#111903 tdf#137152 PPTX export: fix placeholders". Change-Id: If686e487bca9c198fd7c96860a21e4efe91381bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130005 Tested-by: László Németh Reviewed-by: László Németh (cherry picked from commit f29c14e8c36819296d0c66bb995201acf0a2647e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130675 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- oox/source/export/drawingml.cxx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'oox/source') diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 69f210cfe325..c457e65ac0c8 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2450,6 +2450,10 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun, if (GetProperty(rXPropSet, "NumberingIsNumber")) mAny >>= bNumberingIsNumber; + float nFontSize = -1; + if (GetProperty(rXPropSet, "CharHeight")) + mAny >>= nFontSize; + bool bIsURLField = false; OUString sFieldValue = GetFieldValue( rRun, bIsURLField ); bool bWriteField = !( sFieldValue.isEmpty() || bIsURLField ); @@ -2482,7 +2486,16 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun, if (sText == "\n") { - mpFS->singleElementNS(XML_a, XML_br); + // Empty run? Do not forget to write the font size in case of pptx: + if ((GetDocumentType() == DOCUMENT_PPTX) && (nFontSize != -1)) + { + mpFS->startElementNS(XML_a, XML_br); + mpFS->singleElementNS(XML_a, XML_rPr, XML_sz, + OString::number(nFontSize * 100).getStr()); + mpFS->endElementNS(XML_a, XML_br); + } + else + mpFS->singleElementNS(XML_a, XML_br); } else { -- cgit