sc/source/filter/excel/xeformula.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e840ab22b71898c07a4d44dbeae250f93b7b5983
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Oct 22 22:07:54 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Oct 23 19:22:37 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 <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4df55ffee791b9fcb4b2f5e6c64ad15b34316faf)
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index dab92a0ba6a9..614794445b5c 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:
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
