From fa3c8f55f45476a23e9927cec585f84ef59a638b Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 12 Jun 2012 22:29:17 +0200 Subject: accept BIT* functions as _xlfnodf.* in Excel import BITAND, BITOR, BITXOR, BITRSHIFT, BITLSHIFT are written as _xlfnodf.* in Excel export because Excel doesn't have them. So far we weren't able to properly read that in again and the #MACRO? error was generated as function result. --- sc/source/filter/excel/xlformula.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 9a11412c2b77..d299aa2d21a9 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -374,11 +374,11 @@ static const XclFunctionInfo saFuncTable_Odf[] = EXC_FUNCENTRY_ODF( ocArabic, 1, 1, 0, "ARABIC" ), EXC_FUNCENTRY_ODF( ocB, 3, 4, 0, "B" ), EXC_FUNCENTRY_ODF( ocBase, 2, 3, 0, "BASE" ), - EXC_FUNCENTRY_ODF( ocNoName, 2, 2, 0, "BITAND" ), - EXC_FUNCENTRY_ODF( ocNoName, 2, 2, 0, "BITLSHIFT" ), - EXC_FUNCENTRY_ODF( ocNoName, 2, 2, 0, "BITOR" ), - EXC_FUNCENTRY_ODF( ocNoName, 2, 2, 0, "BITRSHIFT" ), - EXC_FUNCENTRY_ODF( ocNoName, 2, 2, 0, "BITXOR" ), + EXC_FUNCENTRY_ODF( ocBitAnd, 2, 2, 0, "BITAND" ), + EXC_FUNCENTRY_ODF( ocBitLshift, 2, 2, 0, "BITLSHIFT" ), + EXC_FUNCENTRY_ODF( ocBitOr, 2, 2, 0, "BITOR" ), + EXC_FUNCENTRY_ODF( ocBitRshift, 2, 2, 0, "BITRSHIFT" ), + EXC_FUNCENTRY_ODF( ocBitXor, 2, 2, 0, "BITXOR" ), EXC_FUNCENTRY_ODF( ocChiSqDist, 2, 3, 0, "CHISQDIST" ), EXC_FUNCENTRY_ODF( ocChiSqInv, 2, 2, 0, "CHISQINV" ), EXC_FUNCENTRY_ODF( ocKombin2, 2, 2, 0, "COMBINA" ), -- cgit