diff options
author | Regina Henschel <rb.henschel@t-online.de> | 2012-06-09 17:34:38 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-06-12 23:55:48 +0200 |
commit | e659fbd2779d1f3e6f871a2405db173c5f70d320 (patch) | |
tree | 54314fc5ea379a88bf28c960cb130615a133da2a /sc | |
parent | 3174c0234bd9fdbbd182d05e86a2699e239f7f68 (diff) |
fdo#51017 ODFF: implement missing imaginary functions [AOO i111609 r1348096]
Adds IMTAN, IMSEC, IMCSC, IMCOT, IMSINH, IMCOSH, IMSECH, IMCSCH spreadsheet
functions.
Change-Id: I04ce0b1fdf787c3d8b2301cd92400e54049494bf
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/helpids.h | 8 | ||||
-rw-r--r-- | sc/source/core/tool/addinhelpid.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/tool/odffmap.cxx | 9 | ||||
-rw-r--r-- | sc/util/hidother.src | 8 |
4 files changed, 33 insertions, 0 deletions
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index e2f6e0612468..af0370859324 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -387,6 +387,14 @@ #define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" #define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" #define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" +#define HID_AAI_FUNC_IMTAN "SC_HID_AAI_FUNC_IMTAN" +#define HID_AAI_FUNC_IMSEC "SC_HID_AAI_FUNC_IMSEC" +#define HID_AAI_FUNC_IMCSC "SC_HID_AAI_FUNC_IMCSC" +#define HID_AAI_FUNC_IMCOT "SC_HID_AAI_FUNC_IMCOT" +#define HID_AAI_FUNC_IMSINH "SC_HID_AAI_FUNC_IMSINH" +#define HID_AAI_FUNC_IMCOSH "SC_HID_AAI_FUNC_IMCOSH" +#define HID_AAI_FUNC_IMSECH "SC_HID_AAI_FUNC_IMSECH" +#define HID_AAI_FUNC_IMCSCH "SC_HID_AAI_FUNC_IMCSCH" // DateFunc Addin Functions (max.20) ----------------------------------------- #define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index 67bae51bcef2..0442b5a85ccd 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -91,6 +91,10 @@ const ScUnoAddInHelpId pAnalysisHelpIds[] = { "getImargument" , HID_AAI_FUNC_IMARGUMENT }, { "getImconjugate" , HID_AAI_FUNC_IMCONJUGATE }, { "getImcos" , HID_AAI_FUNC_IMCOS }, + { "getImcosh" , HID_AAI_FUNC_IMCOSH }, + { "getImcot" , HID_AAI_FUNC_IMCOT }, + { "getImcsc" , HID_AAI_FUNC_IMCSC }, + { "getImcsch" , HID_AAI_FUNC_IMCSCH }, { "getImdiv" , HID_AAI_FUNC_IMDIV }, { "getImexp" , HID_AAI_FUNC_IMEXP }, { "getImln" , HID_AAI_FUNC_IMLN }, @@ -99,10 +103,14 @@ const ScUnoAddInHelpId pAnalysisHelpIds[] = { "getImpower" , HID_AAI_FUNC_IMPOWER }, { "getImproduct" , HID_AAI_FUNC_IMPRODUCT }, { "getImreal" , HID_AAI_FUNC_IMREAL }, + { "getImsec" , HID_AAI_FUNC_IMSEC }, + { "getImsech" , HID_AAI_FUNC_IMSECH }, { "getImsin" , HID_AAI_FUNC_IMSIN }, + { "getImsinh" , HID_AAI_FUNC_IMSINH }, { "getImsqrt" , HID_AAI_FUNC_IMSQRT }, { "getImsub" , HID_AAI_FUNC_IMSUB }, { "getImsum" , HID_AAI_FUNC_IMSUM }, + { "getImtan" , HID_AAI_FUNC_IMTAN }, { "getIntrate" , HID_AAI_FUNC_INTRATE }, { "getIseven" , HID_AAI_FUNC_ISEVEN }, { "getIsodd" , HID_AAI_FUNC_ISODD }, diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index 2129da3708c1..b61f8ada2e75 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -95,6 +95,14 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] = { "IMSUB", "IMSUB", false, "com.sun.star.sheet.addin.Analysis.getImsub", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSUB" }, { "IMSUM", "IMSUM", false, "com.sun.star.sheet.addin.Analysis.getImsum", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSUM" }, { "IMSQRT", "IMSQRT", false, "com.sun.star.sheet.addin.Analysis.getImsqrt", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSQRT" }, + { "IMTAN", "IMTAN", false, "com.sun.star.sheet.addin.Analysis.getImtan", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMTAN" }, + { "IMSEC", "IMSEC", false, "com.sun.star.sheet.addin.Analysis.getImsec", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSEC" }, + { "IMCSC", "IMCSC", false, "com.sun.star.sheet.addin.Analysis.getImcsc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCSC" }, + { "IMCOT", "IMCOT", false, "com.sun.star.sheet.addin.Analysis.getImcot", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCOT" }, + { "IMSINH", "IMSINH", false, "com.sun.star.sheet.addin.Analysis.getImsinh", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSINH" }, + { "IMCOSH", "IMCOSH", false, "com.sun.star.sheet.addin.Analysis.getImcosh", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCOSH" }, + { "IMSECH", "IMSECH", false, "com.sun.star.sheet.addin.Analysis.getImsech", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSECH" }, + { "IMCSCH", "IMCSCH", false, "com.sun.star.sheet.addin.Analysis.getImcsch", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCSCH" }, { "COMPLEX", "COMPLEX", false, "com.sun.star.sheet.addin.Analysis.getComplex", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOMPLEX" }, { "CONVERT", "CONVERT_ADD", false, "com.sun.star.sheet.addin.Analysis.getConvert", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCONVERT" }, { "AMORDEGRC", "AMORDEGRC", false, "com.sun.star.sheet.addin.Analysis.getAmordegrc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETAMORDEGRC" }, @@ -134,6 +142,7 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] = { "COUPPCD", "COUPPCD", false, "com.sun.star.sheet.addin.Analysis.getCouppcd", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOUPPCD" }, { "COUPNUM", "COUPNUM", false, "com.sun.star.sheet.addin.Analysis.getCoupnum", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOUPNUM" }, { "FVSCHEDULE", "FVSCHEDULE", false, "com.sun.star.sheet.addin.Analysis.getFvschedule", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETFVSCHEDULE" }, + }; const ScCompiler::AddInMap* ScCompiler::GetAddInMap() diff --git a/sc/util/hidother.src b/sc/util/hidother.src index 6a56a8188c6a..9b3c3fb81307 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -464,6 +464,14 @@ hidspecial HID_AAI_FUNC_IMSIN { HelpID = HID_AAI_FUNC_IMSIN; }; hidspecial HID_AAI_FUNC_IMSUB { HelpID = HID_AAI_FUNC_IMSUB; }; hidspecial HID_AAI_FUNC_IMSUM { HelpID = HID_AAI_FUNC_IMSUM; }; hidspecial HID_AAI_FUNC_IMSQRT { HelpID = HID_AAI_FUNC_IMSQRT; }; +hidspecial HID_AAI_FUNC_IMTAN { HelpID = HID_AAI_FUNC_IMTAN; }; +hidspecial HID_AAI_FUNC_IMSEC { HelpID = HID_AAI_FUNC_IMSEC; }; +hidspecial HID_AAI_FUNC_IMCSC { HelpID = HID_AAI_FUNC_IMCSC; }; +hidspecial HID_AAI_FUNC_IMCOT { HelpID = HID_AAI_FUNC_IMCOT; }; +hidspecial HID_AAI_FUNC_IMSINH { HelpID = HID_AAI_FUNC_IMSINH; }; +hidspecial HID_AAI_FUNC_IMCOSH { HelpID = HID_AAI_FUNC_IMCOSH; }; +hidspecial HID_AAI_FUNC_IMSECH { HelpID = HID_AAI_FUNC_IMSECH; }; +hidspecial HID_AAI_FUNC_IMCSCH { HelpID = HID_AAI_FUNC_IMCSCH; }; hidspecial HID_AAI_FUNC_COMPLEX { HelpID = HID_AAI_FUNC_COMPLEX; }; hidspecial HID_AAI_FUNC_OCT2BIN { HelpID = HID_AAI_FUNC_OCT2BIN; }; hidspecial HID_AAI_FUNC_OCT2DEZ { HelpID = HID_AAI_FUNC_OCT2DEZ; }; |