[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/qa oox/source

[Sarper Akdemir (via logerrit)]

 oox/qa/unit/data/endParaRPr-newline-textsize.pptx |binary
 oox/source/export/drawingml.cxx                   |    4 ++++
 2 files changed, 4 insertions(+)

New commits:
commit 83ec1b93e9c7176300c740a6fec9f7932e87342b
Author:     Sarper Akdemir <sarper.akde...@collabora.com>
AuthorDate: Tue Jan 11 02:06:52 2022 +0300
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Feb 20 13:45:16 2022 +0100

    tdf#146690: pptx export: fix endParaRPr size value for empty paragraphs
    
    Fixes paragraphs made from a single new line, not getting the
    correct sz(text size) value in EndParagraphRunProperties on pptx
    export
    
    Change-Id: I31ebb5735ad392e081aa2f43b0b60a845e4de9c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128281
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/oox/qa/unit/data/endParaRPr-newline-textsize.pptx 
b/oox/qa/unit/data/endParaRPr-newline-textsize.pptx
new file mode 100755
index 000000000000..109f818ec8a7
Binary files /dev/null and b/oox/qa/unit/data/endParaRPr-newline-textsize.pptx 
differ
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f5ddabb12939..5d3996430eff 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2853,7 +2853,11 @@ void DrawingML::WriteParagraph( const Reference< 
XTextContent >& rParagraph,
                 Reference< XPropertySet > xFirstRunPropSet (run, UNO_QUERY);
                 Reference< XPropertySetInfo > xFirstRunPropSetInfo = 
xFirstRunPropSet->getPropertySetInfo();
                 if( xFirstRunPropSetInfo->hasPropertyByName("CharHeight") )
+                {
                     fFirstCharHeight = 
xFirstRunPropSet->getPropertyValue("CharHeight").get<float>();
+                    rnCharHeight = 100 * fFirstCharHeight;
+                    rbOverridingCharHeight = true;
+                }
                 WriteParagraphProperties( rParagraph, fFirstCharHeight );
                 bPropertiesWritten = true;
             }