[Libreoffice-commits] core.git: include/oox oox/source

[Mike Kaganski (via logerrit)]

 include/oox/export/drawingml.hxx |    2 +-
 oox/source/export/drawingml.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60ea95afb2e2ed299711d8244a2ffb1c960c7eb2
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Jul 13 10:28:32 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jul 13 12:57:58 2021 +0200

    Avoid default argument value, and be explicit
    
    Helps seeing which element used where
    
    Change-Id: Ieb5f1ea4ca983211d995268210dc2d9b14061721
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118796
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index c90e1c06a844..77ff77174cc9 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -288,7 +288,7 @@ public:
 
         @returns true if any paragraph properties were written
     */
-    bool WriteParagraphProperties(const css::uno::Reference< css::text::XTextContent >& rParagraph, float fFirstCharHeight, const sal_Int32 nElement = XML_pPr );
+    bool WriteParagraphProperties(const css::uno::Reference< css::text::XTextContent >& rParagraph, float fFirstCharHeight, sal_Int32 nElement);
     void WriteParagraphNumbering(const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight,
                                   sal_Int16 nLevel );
     void WriteParagraphTabStops(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cc823858e337..7c6754a35f6d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3016,7 +3016,7 @@ void DrawingML::WriteParagraph( const Reference< XTextContent >& rParagraph,
                 Reference< XPropertySetInfo > xFirstRunPropSetInfo = xFirstRunPropSet->getPropertySetInfo();
                 if( xFirstRunPropSetInfo->hasPropertyByName("CharHeight") )
                     fFirstCharHeight = xFirstRunPropSet->getPropertyValue("CharHeight").get<float>();
-                WriteParagraphProperties( rParagraph, fFirstCharHeight );
+                WriteParagraphProperties(rParagraph, fFirstCharHeight, XML_pPr);
                 bPropertiesWritten = true;
             }
             WriteRun( run, rbOverridingCharHeight, rnCharHeight, rXShapePropSet);