From 8f24c2d9cf0ffe5a0cb15c60aa6d1e47a91a5a12 Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Wed, 9 Jun 2010 18:57:42 +0200 Subject: [PATCH] calc55: dumb ass MSVC, ScCompiler::IsOpCode::FunctionName : default constructor could not be generated; maybe moving the struct to file scope helps? --- sc/source/core/tool/compiler.cxx | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 9dbb25bd5bb5..3177ddca2898 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -121,6 +121,24 @@ enum ScanState ssStop }; +// ODFF names that are not written in the current mapping but to be recognized. +// New names will be written in a future relase, then exchange (!) with the +// names in formula/source/core/resource/core_resource.src to be able to still +// read the old names as well. +struct FunctionName +{ + const sal_Char* pName; + const OpCode eOp; +}; +static const FunctionName aOdffAliases[] = { + // Renamed old names: + // XXX none yet. + // Renamed new names: + { "BINOM.DIST.RANGE", ocB }, // B -> BINOM.DIST.RANGE + { "LEGACY.TDIST", ocTDist } // TDIST -> LEGACY.TDIST +}; +static const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]); + static const sal_Char* pInternal[ 1 ] = { "TTT" }; using namespace ::com::sun::star::i18n; @@ -2506,24 +2524,6 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray ) } else if (mxSymbols->isODFF()) { - // ODFF names that are not written in the current mapping but to be - // recognized. New names will be written in a future relase, then - // exchange (!) with the names in - // formula/source/core/resource/core_resource.src to be able to still - // read the old names as well. - struct FunctionName - { - const sal_Char* pName; - const OpCode eOp; - }; - static const FunctionName aOdffAliases[] = { - // Renamed old names: - // XXX none yet. - // Renamed new names: - { "BINOM.DIST.RANGE", ocB }, // B -> BINOM.DIST.RANGE - { "LEGACY.TDIST", ocTDist } // TDIST -> LEGACY.TDIST - }; - const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]); for (size_t i=0; i