You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by re...@apache.org on 2012/06/08 16:54:21 UTC
svn commit: r1348096 - in /incubator/ooo/trunk/main:
helpcontent2/source/text/scalc/01/ sc/inc/ sc/source/core/tool/ sc/util/
scaddins/source/analysis/
Author: regina
Date: Fri Jun 8 14:54:21 2012
New Revision: 1348096
URL: http://svn.apache.org/viewvc?rev=1348096&view=rev
Log:
i111609 ODFF implement missing imaginary functions
Modified:
incubator/ooo/trunk/main/helpcontent2/source/text/scalc/01/04060116.xhp
incubator/ooo/trunk/main/sc/inc/helpids.h
incubator/ooo/trunk/main/sc/source/core/tool/addinhelpid.cxx
incubator/ooo/trunk/main/sc/source/core/tool/odffmap.cxx
incubator/ooo/trunk/main/sc/util/hidother.src
incubator/ooo/trunk/main/scaddins/source/analysis/analysis.cxx
incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hrc
incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hxx
incubator/ooo/trunk/main/scaddins/source/analysis/analysis.src
incubator/ooo/trunk/main/scaddins/source/analysis/analysis_deffuncnames.src
incubator/ooo/trunk/main/scaddins/source/analysis/analysis_funcnames.src
incubator/ooo/trunk/main/scaddins/source/analysis/analysisadd.idl
incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.cxx
incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.hxx
Modified: incubator/ooo/trunk/main/helpcontent2/source/text/scalc/01/04060116.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/scalc/01/04060116.xhp?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/scalc/01/04060116.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/scalc/01/04060116.xhp Fri Jun 8 14:54:21 2012
@@ -46,8 +46,6 @@
</section>
<sort>
<section id="imabs">
- <paragraph xml-lang="en-US" id="par_id3145074" role="paragraph" l10n="E" oldref="166"
- localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154959"><bookmark_value>IMABS function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMABS" id="bm_id3154541" localize="false"/>
@@ -123,7 +121,67 @@
<paragraph xml-lang="en-US" id="hd_id3152980" role="heading" level="3" l10n="U"
oldref="78">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3157901" role="paragraph" l10n="U" oldref="79">
- <item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85i (rounded).</paragraph>
+ <item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85j (rounded).</paragraph>
+ </section>
+ <section id="imcosh">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149148"><bookmark_value>IMCOSH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCOS" id="bm_id3150380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149148" role="heading" level="2" oldref="">IMCOSH</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149727" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCOSH">The result is the hyberbolic cosine of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159118" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147417" role="code" l10n="New" oldref="">IMCOSH("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3152982" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157903" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMCOSH("3+4j") </item>returns -6.58066304-7.58155274j (rounded).</paragraph>
+ </section>
+ <section id="imcot">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149149"><bookmark_value>IMCOT function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCOT" id="bm_id3150381" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149149" role="heading" level="2" oldref="">IMCOT</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149728" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCOT">The result is the cotangent of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159119" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147418" role="code" l10n="New" oldref="">IMCOT("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3152983" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157904" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMCOT("3+4j") </item>returns -0.00018759-1.00064439j (rounded).</paragraph>
+ </section>
+ <section id="imcsc">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149147"><bookmark_value>IMCSC function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCSC" id="bm_id3150379" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149147" role="heading" level="2" oldref="">IMCSC</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149726" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCSC">The result is the cosecant of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159117" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147416" role="code" l10n="New" oldref="">IMCSC("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3152981" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157902" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMCSC("3+4j") </item>returns 0.00517447+0.03627589j (rounded).</paragraph>
+ </section>
+ <section id="imcsch">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149150"><bookmark_value>IMCSCH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCSCH" id="bm_id3150382" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149150" role="heading" level="2" oldref="">IMCSCH</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149729" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCSCH">The result is the hyperbolic cosecant of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159120" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147419" role="code" l10n="New" oldref="">IMCSCH("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3152984" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157905" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMCSCH("3+4j") </item>returns -1.30632891+1.51251400j (rounded). </paragraph>
</section>
<section id="imdiv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150024"><bookmark_value>IMDIV function</bookmark_value>
@@ -246,6 +304,36 @@
<paragraph xml-lang="en-US" id="par_id3155986" role="paragraph" l10n="U" oldref="135">
<item type="input">=IMREAL("1+3j")</item> returns 1.</paragraph>
</section>
+ <section id="imsec">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148430"><bookmark_value>IMSEC function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSEC" id="bm_id3153715" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148430" role="heading" level="2" oldref="">IMSEC</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152590" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSEC">The result is the secant of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149821" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150386" role="code" l10n="New" oldref="">IMSEC("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3150612" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154309" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMSEC("3+4j")</item> returns -0.03625350+0.00516434j (rounded).</paragraph>
+ </section>
+ <section id="imsech">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148432"><bookmark_value>IMSECH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSECH" id="bm_id3153717" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148432" role="heading" level="2" oldref="">IMSECH</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152592" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSECH">The result is the hyperbolic secant of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149823" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150388" role="code" l10n="New" oldref="">IMSECH("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3150614" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154311" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMSECH("3+4j")</item> returns -1.30823089+1.51467895j (rounded).</paragraph>
+ </section>
<section id="imsin">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148431"><bookmark_value>IMSIN function</bookmark_value>
</bookmark>
@@ -261,6 +349,21 @@
<paragraph xml-lang="en-US" id="par_id3154310" role="paragraph" l10n="U" oldref="142">
<item type="input">=IMSIN("3+4j")</item> returns 3.85+27.02j (rounded).</paragraph>
</section>
+ <section id="imsinh">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148433"><bookmark_value>IMSINH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSINH" id="bm_id3153718" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148433" role="heading" level="2" oldref="">IMSINH</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152593" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSINH">The result is the hyperbolic sine of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149824" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150389" role="code" l10n="New" oldref="">IMSINH("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3150615" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154312" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMSINH("3+4j")</item> returns -6.54812004-7.61923172j (rounded).</paragraph>
+ </section>
<section id="imsub">
<bookmark xml-lang="en-US" branch="index" id="bm_id3163826"><bookmark_value>IMSUB function</bookmark_value>
</bookmark>
@@ -306,6 +409,21 @@
<paragraph xml-lang="en-US" id="par_id3152807" role="paragraph" l10n="U" oldref="173">
<item type="input">=IMSQRT("3+4i")</item> returns 2+1i.</paragraph>
</section>
+ <section id="imtan">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149151"><bookmark_value>IMTAN function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMTAN" id="bm_id3150383" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149151" role="heading" level="2" oldref="">IMTAN</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149730" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMTAN">The result is the tangent of a complex number.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159121" role="heading" level="3" l10n="New"
+ oldref="">Syntax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147420" role="code" l10n="New" oldref="">IMTAN("ComplexNumber")</paragraph>
+ <embed href="text/scalc/01/04060116.xhp#complex"/>
+ <paragraph xml-lang="en-US" id="hd_id3152985" role="heading" level="3" l10n="New"
+ oldref="">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157906" role="paragraph" l10n="New" oldref="">
+ <item type="input">=IMTAN("3+4j") </item>returns -0.00018734+0.99935599j (rounded).</paragraph>
+ </section>
<section id="complexfunc">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154054"><bookmark_value>COMPLEX function</bookmark_value>
</bookmark>
Modified: incubator/ooo/trunk/main/sc/inc/helpids.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/inc/helpids.h?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/inc/helpids.h (original)
+++ incubator/ooo/trunk/main/sc/inc/helpids.h Fri Jun 8 14:54:21 2012
@@ -379,6 +379,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"
Modified: incubator/ooo/trunk/main/sc/source/core/tool/addinhelpid.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/tool/addinhelpid.cxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/tool/addinhelpid.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/tool/addinhelpid.cxx Fri Jun 8 14:54:21 2012
@@ -88,6 +88,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 },
@@ -96,10 +100,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 },
Modified: incubator/ooo/trunk/main/sc/source/core/tool/odffmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/tool/odffmap.cxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/tool/odffmap.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/tool/odffmap.cxx Fri Jun 8 14:54:21 2012
@@ -91,6 +91,14 @@ ScCompiler::AddInMap ScCompiler::maAddIn
{ "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" },
@@ -130,6 +138,7 @@ ScCompiler::AddInMap ScCompiler::maAddIn
{ "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" },
+
};
// static
Modified: incubator/ooo/trunk/main/sc/util/hidother.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/util/hidother.src?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/util/hidother.src (original)
+++ incubator/ooo/trunk/main/sc/util/hidother.src Fri Jun 8 14:54:21 2012
@@ -449,6 +449,14 @@ hidspecial HID_AAI_FUNC_IMSIN { HelpID
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; };
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis.cxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis.cxx (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis.cxx Fri Jun 8 14:54:21 2012
@@ -1240,6 +1240,86 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt
}
+STRING SAL_CALL AnalysisAddIn::getImtan( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Tan();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsec( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Sec();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcsc( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Csc();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcot( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Cot();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsinh( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Sinh();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcosh( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Cosh();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsech( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Sech();
+
+ return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcsch( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+ Complex z( aNum );
+
+ z.Csch();
+
+ return z.GetString();
+}
+
+
STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuff ) THROWDEF_RTE_IAE
{
sal_Bool bi;
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hrc?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hrc (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hrc Fri Jun 8 14:54:21 2012
@@ -127,7 +127,14 @@
#define ANALYSIS_Couppcd (ANALYSIS_FUNCDESC_START+90)
#define ANALYSIS_Coupnum (ANALYSIS_FUNCDESC_START+91)
#define ANALYSIS_Fvschedule (ANALYSIS_FUNCDESC_START+92)
-
+#define ANALYSIS_Imtan (ANALYSIS_FUNCDESC_START+93)
+#define ANALYSIS_Imsec (ANALYSIS_FUNCDESC_START+94)
+#define ANALYSIS_Imcsc (ANALYSIS_FUNCDESC_START+95)
+#define ANALYSIS_Imcot (ANALYSIS_FUNCDESC_START+96)
+#define ANALYSIS_Imsinh (ANALYSIS_FUNCDESC_START+97)
+#define ANALYSIS_Imcosh (ANALYSIS_FUNCDESC_START+98)
+#define ANALYSIS_Imsech (ANALYSIS_FUNCDESC_START+99)
+#define ANALYSIS_Imcsch (ANALYSIS_FUNCDESC_START+100)
#define ANALYSIS_FUNCNAME_START (1)
@@ -224,7 +231,14 @@
#define ANALYSIS_FUNCNAME_Couppcd (ANALYSIS_FUNCNAME_START+90)
#define ANALYSIS_FUNCNAME_Coupnum (ANALYSIS_FUNCNAME_START+91)
#define ANALYSIS_FUNCNAME_Fvschedule (ANALYSIS_FUNCNAME_START+92)
-
+#define ANALYSIS_FUNCNAME_Imtan (ANALYSIS_FUNCNAME_START+93)
+#define ANALYSIS_FUNCNAME_Imsec (ANALYSIS_FUNCNAME_START+94)
+#define ANALYSIS_FUNCNAME_Imcsc (ANALYSIS_FUNCNAME_START+95)
+#define ANALYSIS_FUNCNAME_Imcot (ANALYSIS_FUNCNAME_START+96)
+#define ANALYSIS_FUNCNAME_Imsinh (ANALYSIS_FUNCNAME_START+97)
+#define ANALYSIS_FUNCNAME_Imcosh (ANALYSIS_FUNCNAME_START+98)
+#define ANALYSIS_FUNCNAME_Imsech (ANALYSIS_FUNCNAME_START+99)
+#define ANALYSIS_FUNCNAME_Imcsch (ANALYSIS_FUNCNAME_START+100)
#define ANALYSIS_DEFFUNCNAME_START (RID_ANALYSIS_DEFFUNCTION_NAMES+1)
@@ -321,6 +335,13 @@
#define ANALYSIS_DEFFUNCNAME_Couppcd (ANALYSIS_DEFFUNCNAME_START+90)
#define ANALYSIS_DEFFUNCNAME_Coupnum (ANALYSIS_DEFFUNCNAME_START+91)
#define ANALYSIS_DEFFUNCNAME_Fvschedule (ANALYSIS_DEFFUNCNAME_START+92)
-
+#define ANALYSIS_DEFFUNCNAME_Imtan (ANALYSIS_DEFFUNCNAME_START+93)
+#define ANALYSIS_DEFFUNCNAME_Imsec (ANALYSIS_DEFFUNCNAME_START+94)
+#define ANALYSIS_DEFFUNCNAME_Imcsc (ANALYSIS_DEFFUNCNAME_START+95)
+#define ANALYSIS_DEFFUNCNAME_Imcot (ANALYSIS_DEFFUNCNAME_START+96)
+#define ANALYSIS_DEFFUNCNAME_Imsinh (ANALYSIS_DEFFUNCNAME_START+97)
+#define ANALYSIS_DEFFUNCNAME_Imcosh (ANALYSIS_DEFFUNCNAME_START+98)
+#define ANALYSIS_DEFFUNCNAME_Imsech (ANALYSIS_DEFFUNCNAME_START+99)
+#define ANALYSIS_DEFFUNCNAME_Imcsch (ANALYSIS_DEFFUNCNAME_START+100)
#endif
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hxx (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis.hxx Fri Jun 8 14:54:21 2012
@@ -188,6 +188,14 @@ public:
virtual STRING SAL_CALL getImsum( constREFXPS& xOpt, const SEQSEQ( STRING )& aNum1, const SEQ( ANY )& aFollowingPars ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImtan( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsec( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImcsc( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImcot( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsinh( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImcosh( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsech( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImcsch( const STRING& aNum ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getComplex( double fReal, double fImaginary, const ANY& rSuffix ) THROWDEF_RTE_IAE;
virtual double SAL_CALL getConvert( double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE;
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis.src?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis.src (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis.src Fri Jun 8 14:54:21 2012
@@ -1350,6 +1350,150 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTI
};
+ Resource ANALYSIS_Imtan
+ {
+ String 1 // description Imtan
+ {
+ Text [ en-US ] = "Returns the tangent of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imtan
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imtan
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imsec
+ {
+ String 1 // description Imsec
+ {
+ Text [ en-US ] = "Returns the secant of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imsec
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imsec
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imcsc
+ {
+ String 1 // description Imcsc
+ {
+ Text [ en-US ] = "Returns the cosecant of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imcsc
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imcsc
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imcot
+ {
+ String 1 // description Imcot
+ {
+ Text [ en-US ] = "Returns the cotangent of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imcot
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imcot
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imsinh
+ {
+ String 1 // description Imsinh
+ {
+ Text [ en-US ] = "Returns the hyperbolic sine of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imsinh
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imsinh
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imcosh
+ {
+ String 1 // description Imcosh
+ {
+ Text [ en-US ] = "Returns the hyperbolic cosine of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imcosh
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imcosh
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imsech
+ {
+ String 1 // description Imsech
+ {
+ Text [ en-US ] = "Returns the hyperbolic secant of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imsech
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imsech
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
+ Resource ANALYSIS_Imcsch
+ {
+ String 1 // description Imcsch
+ {
+ Text [ en-US ] = "Returns the hyperbolic cosecant of a complex number";
+ };
+
+ String 2 // name of parameter 1 Imcsch
+ {
+ Text [ en-US ] = "Complex number";
+ };
+
+ String 3 // description of parameter 1 Imcsch
+ {
+ Text [ en-US ] = "A complex number";
+ };
+ };
+
Resource ANALYSIS_Complex
{
String 1 // description Complex
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis_deffuncnames.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis_deffuncnames.src?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis_deffuncnames.src (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis_deffuncnames.src Fri Jun 8 14:54:21 2012
@@ -811,6 +811,78 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES
};
};
+ StringArray ANALYSIS_DEFFUNCNAME_Imtan
+ {
+ ItemList =
+ {
+ < "IMTAN"; >;
+ < "IMTAN"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imsec
+ {
+ ItemList =
+ {
+ < "IMSEC"; >;
+ < "IMSEC"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imcsc
+ {
+ ItemList =
+ {
+ < "IMCSC"; >;
+ < "IMCSC"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imcot
+ {
+ ItemList =
+ {
+ < "IMCOT"; >;
+ < "IMCOT"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imsinh
+ {
+ ItemList =
+ {
+ < "IMSINH"; >;
+ < "IMSINH"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imcosh
+ {
+ ItemList =
+ {
+ < "IMCOSH"; >;
+ < "IMCOSH"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imsech
+ {
+ ItemList =
+ {
+ < "IMSECH"; >;
+ < "IMSECH"; >;
+ };
+ };
+
+ StringArray ANALYSIS_DEFFUNCNAME_Imcsch
+ {
+ ItemList =
+ {
+ < "IMCSCH"; >;
+ < "IMCSCH"; >;
+ };
+ };
+
StringArray ANALYSIS_DEFFUNCNAME_Complex
{
ItemList =
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysis_funcnames.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysis_funcnames.src?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysis_funcnames.src (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysis_funcnames.src Fri Jun 8 14:54:21 2012
@@ -463,6 +463,46 @@ Resource RID_ANALYSIS_FUNCTION_NAMES
Text [ en-US ] = "IMSQRT";
};
+ String ANALYSIS_FUNCNAME_Imtan
+ {
+ Text [ en-US ] = "IMTAN";
+ };
+
+ String ANALYSIS_FUNCNAME_Imsec
+ {
+ Text [ en-US ] = "IMSEC";
+ };
+
+ String ANALYSIS_FUNCNAME_Imcsc
+ {
+ Text [ en-US ] = "IMCSC";
+ };
+
+ String ANALYSIS_FUNCNAME_Imcot
+ {
+ Text [ en-US ] = "IMCOT";
+ };
+
+ String ANALYSIS_FUNCNAME_Imsinh
+ {
+ Text [ en-US ] = "IMSINH";
+ };
+
+ String ANALYSIS_FUNCNAME_Imcosh
+ {
+ Text [ en-US ] = "IMCOSH";
+ };
+
+ String ANALYSIS_FUNCNAME_Imsech
+ {
+ Text [ en-US ] = "IMSECH";
+ };
+
+ String ANALYSIS_FUNCNAME_Imcsch
+ {
+ Text [ en-US ] = "IMCSCH";
+ };
+
String ANALYSIS_FUNCNAME_Complex
{
Text [ en-US ] = "COMPLEX";
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysisadd.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysisadd.idl?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysisadd.idl (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysisadd.idl Fri Jun 8 14:54:21 2012
@@ -328,6 +328,38 @@ module addin
string getImsqrt( [in] string Num )
raises( com::sun::star::lang::IllegalArgumentException );
+ /// imtan.
+ string getImtan( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imsec.
+ string getImsec( [in] string Num)
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imcsc.
+ string getImcsc( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imcot.
+ string getImcot( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imsinh.
+ string getImsinh( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imcosh.
+ string getImcosh( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imsech.
+ string getImsech( [in] string Num)
+ raises( com::sun::star::lang::IllegalArgumentException );
+
+ /// imcsch.
+ string getImcsch( [in] string Num )
+ raises( com::sun::star::lang::IllegalArgumentException );
+
/// complex.
string getComplex( [in] double Real, [in] double Imaginary, [in] any Suffix )
raises( com::sun::star::lang::IllegalArgumentException );
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.cxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.cxx Fri Jun 8 14:54:21 2012
@@ -102,6 +102,14 @@ const FuncDataBase pFuncDatas[] =
FUNCDATA( Imsub, UNIQUE, STDPAR, 2, FDCat_Tech ),
FUNCDATA( Imsqrt, UNIQUE, STDPAR, 1, FDCat_Tech ),
FUNCDATA( Imsum, UNIQUE, INTPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imtan, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imsec, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imcsc, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imcot, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imsinh, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imcosh, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imsech, UNIQUE, STDPAR, 1, FDCat_Tech ),
+ FUNCDATA( Imcsch, UNIQUE, STDPAR, 1, FDCat_Tech ),
FUNCDATA( Complex, UNIQUE, STDPAR, 3, FDCat_Tech ),
FUNCDATA( Convert, DOUBLE, STDPAR, 3, FDCat_Tech ),
FUNCDATA( Amordegrc, UNIQUE, INTPAR, 7, FDCat_Finance ),
@@ -1991,15 +1999,9 @@ void Complex::Sqrt( void )
}
-inline sal_Bool SinOverflow( double f )
-{
- return fabs( f ) >= 134217728;
-}
-
-
void Complex::Sin( void ) THROWDEF_RTE_IAE
{
- if( SinOverflow( r ) )
+ if( !::rtl::math::isValidArcArg( r ) )
THROW_IAE;
if( i )
@@ -2017,7 +2019,7 @@ void Complex::Sin( void ) THROWDEF_RTE_I
void Complex::Cos( void ) THROWDEF_RTE_IAE
{
- if( SinOverflow( r ) )
+ if( !::rtl::math::isValidArcArg( r ) )
THROW_IAE;
if( i )
@@ -2091,6 +2093,160 @@ void Complex::Log2( void ) THROWDEF_RTE_
}
+void Complex::Tan(void) THROWDEF_RTE_IAE
+{
+ if ( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+ THROW_IAE;
+ double fScale =1.0 / ( cos( 2.0 * r ) + cosh( 2.0 * i ));
+ r = sin( 2.0 * r ) * fScale;
+ i = sinh( 2.0 * i ) * fScale;
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = tan( r );
+ }
+}
+
+
+void Complex::Sec( void ) THROWDEF_RTE_IAE
+{
+ if( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2 * r ) )
+ THROW_IAE;
+ double fScale = 1.0 / (cosh( 2.0 * i) + cos ( 2.0 * r));
+ double r_;
+ r_ = 2.0 * cos( r ) * cosh( i ) * fScale;
+ i = 2.0 * sin( r ) * sinh( i ) * fScale;
+ r = r_;
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = 1.0 / cos( r );
+ }
+}
+
+
+void Complex::Csc( void ) THROWDEF_RTE_IAE
+{
+ if( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2 * r ) )
+ THROW_IAE;
+ double fScale = 1.0 / (cosh( 2.0 * i) - cos ( 2.0 * r));
+ double r_;
+ r_ = 2.0 * sin( r ) * cosh( i ) * fScale;
+ i = -2.0 * cos( r ) * sinh( i ) * fScale;
+ r = r_;
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = 1.0 / sin( r );
+ }
+}
+
+
+void Complex::Cot(void) THROWDEF_RTE_IAE
+{
+ if ( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+ THROW_IAE;
+ double fScale =1.0 / ( cosh( 2.0 * i ) - cos( 2.0 * r ) );
+ r = sin( 2.0 * r ) * fScale;
+ i = - ( sinh( 2.0 * i ) * fScale );
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = 1.0 / tan( r );
+ }
+}
+
+
+void Complex::Sinh( void ) THROWDEF_RTE_IAE
+{
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+
+ if( i )
+ {
+ double r_;
+ r_ = sinh( r ) * cos( i );
+ i = cosh( r ) * sin( i );
+ r = r_;
+ }
+ else
+ r = sinh( r );
+}
+
+
+void Complex::Cosh( void ) THROWDEF_RTE_IAE
+{
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+
+ if( i )
+ {
+ double r_;
+ r_ = cosh( r ) * cos( i );
+ i = sinh( r ) * sin( i );
+ r = r_;
+ }
+ else
+ r = cosh( r );
+}
+
+
+void Complex::Sech(void) THROWDEF_RTE_IAE
+{
+ if ( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+ THROW_IAE;
+ double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i ));
+ double r_;
+ r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale;
+ i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale );
+ r = r_ ;
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = 1.0 / cosh( r );
+ }
+}
+
+
+void Complex::Csch(void) THROWDEF_RTE_IAE
+{
+ if ( i )
+ {
+ if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+ THROW_IAE;
+ double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i ));
+ double r_;
+ r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale;
+ i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale );
+ r = r_ ;
+ }
+ else
+ {
+ if( !::rtl::math::isValidArcArg( r ) )
+ THROW_IAE;
+ r = 1.0 / sinh( r );
+ }
+}
ComplexList::~ComplexList()
Modified: incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.hxx?rev=1348096&r1=1348095&r2=1348096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.hxx (original)
+++ incubator/ooo/trunk/main/scaddins/source/analysis/analysishelper.hxx Fri Jun 8 14:54:21 2012
@@ -443,7 +443,7 @@ class Complex
sal_Unicode c;
public:
- inline Complex( double fReal, double fImag = 0.0, sal_Char cC = '\0' );
+ inline Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
Complex( const STRING& rComplexAsString ) THROWDEF_RTE_IAE;
inline static sal_Bool IsImagUnit( sal_Unicode c );
@@ -471,6 +471,15 @@ public:
inline void Mult( const Complex& rMult );
inline void Sub( const Complex& rMult );
inline void Add( const Complex& rAdd );
+ void Tan( void ) THROWDEF_RTE_IAE;
+ void Sec( void ) THROWDEF_RTE_IAE;
+ void Csc( void ) THROWDEF_RTE_IAE;
+ void Cot( void ) THROWDEF_RTE_IAE;
+ void Sinh( void ) THROWDEF_RTE_IAE;
+ void Cosh( void ) THROWDEF_RTE_IAE;
+ void Sech( void ) THROWDEF_RTE_IAE;
+ void Csch( void ) THROWDEF_RTE_IAE;
+
};
@@ -788,7 +797,7 @@ inline const FuncData* FuncDataList::Get
}
-inline Complex::Complex( double fReal, double fImag, sal_Char cC ) :
+inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) :
r( fReal ), i( fImag ), c( cC )
{
}