sc/source/core/tool/compiler.cxx | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
New commits: commit f3f89f4f3180b0fd63c5290c665894c6a27f2ae2 Author: Eike Rathke <er...@redhat.com> Date: Mon Jun 27 13:20:58 2016 +0200 accept EFFECTIVE as EFFECT in OOXML import Change-Id: I18a914972d69a37e9dcf5b18ffbea9177004dad7 diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 9782028..adff3f4 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2740,6 +2740,28 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray ) } } } + else if (mxSymbols->isOOXML()) + { + // OOXML names that are not written in the current mapping but to be + // recognized as old versions wrote them. + struct FunctionName + { + const sal_Char* pName; + OpCode eOp; + }; + static const FunctionName aOoxmlAliases[] = { + { "EFFECTIVE", ocEffective } // EFFECTIVE -> EFFECT + }; + for (const FunctionName& rOoxmlAlias : aOoxmlAliases) + { + if (rName.equalsIgnoreAsciiCaseAscii( rOoxmlAlias.pName)) + { + maRawToken.SetOpCode( rOoxmlAlias.eOp); + bFound = true; + break; // for + } + } + } if (!bFound) { OUString aIntName; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits