[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xeformula.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d6f563b37d8a694c6c1d4c9ef3ba746c7f019517
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon Oct 22 22:07:54 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Wed Oct 24 10:33:41 2018 +0200

    Resolves: tdf#120689 omit <definedName> for ocMacro in OOXML
    
    Change-Id: I7578d568d2afe5d3a45b31a8a349cd370b03fc67
    Reviewed-on: https://gerrit.libreoffice.org/62204
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 4df55ffee791b9fcb4b2f5e6c64ad15b34316faf)
    Reviewed-on: https://gerrit.libreoffice.org/62235
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 3cd1bd9a06bf..e8cb691b5bdb 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1632,7 +1632,11 @@ void XclExpFmlaCompImpl::AppendDefaultParam( XclExpFuncData& rFuncData )
             AppendEuroToolCallToken( rFuncData.GetExtFuncData() );
         break;
         case ocMacro:
-            AppendMacroCallToken( rFuncData.GetExtFuncData() );
+            // Do not write the OOXML <definedName> element.
+            if (GetOutput() == EXC_OUTPUT_XML_2007)
+                AppendNameToken( 0 );     // dummy to keep parameter count valid
+            else
+                AppendMacroCallToken( rFuncData.GetExtFuncData() );
         break;
         default:
         {