diff options
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 128 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysis.hxx | 111 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysisadd.idl | 208 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 170 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysishelper.hxx | 39 |
5 files changed, 302 insertions, 354 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index eb2b8ac9bd47..388f5eb53f3b 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: analysis.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2001-05-08 15:35:52 $ + * last change: $Author: gt $ $Date: 2001-05-09 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1007,19 +1007,19 @@ sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( constREFXPS& xOpt, } -sal_Int32 SAL_CALL AnalysisAddIn::getIseven( constREFXPS&, sal_Int32 nVal ) THROWDEF_RTE +sal_Int32 SAL_CALL AnalysisAddIn::getIseven( sal_Int32 nVal ) THROWDEF_RTE { return ( nVal & 0x00000001 )? 0 : 1; } -sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( constREFXPS&, sal_Int32 nVal ) THROWDEF_RTE +sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( sal_Int32 nVal ) THROWDEF_RTE { return ( nVal & 0x00000001 )? 1 : 0; } -double SAL_CALL AnalysisAddIn::getMultinomial( constREFXPS&, const SEQSEQ( sal_Int32 )& aV ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getMultinomial( const SEQSEQ( sal_Int32 )& aV ) THROWDEF_RTE_IAE { sal_Int32 n1, n2; sal_Int32 nE1 = aV.getLength(); @@ -1054,8 +1054,7 @@ double SAL_CALL AnalysisAddIn::getMultinomial( constREFXPS&, const SEQSEQ( sal_I } -double SAL_CALL AnalysisAddIn::getSeriessum( constREFXPS&, - double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE { double fRet = 0.0; @@ -1085,13 +1084,13 @@ double SAL_CALL AnalysisAddIn::getSeriessum( constREFXPS&, } -double SAL_CALL AnalysisAddIn::getQuotient( constREFXPS&, double fNum, double fDenum ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenum ) THROWDEF_RTE { return SolarMath::ApproxFloor( fNum / fDenum ); } -double SAL_CALL AnalysisAddIn::getMround( constREFXPS&, double fNum, double fMult ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) THROWDEF_RTE { if( fMult == 0.0 ) return fMult; @@ -1100,13 +1099,13 @@ double SAL_CALL AnalysisAddIn::getMround( constREFXPS&, double fNum, double fMul } -double SAL_CALL AnalysisAddIn::getSqrtpi( constREFXPS&, double fNum ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum ) THROWDEF_RTE { return sqrt( fNum * PI ); } -double SAL_CALL AnalysisAddIn::getRandbetween( constREFXPS&, double fMin, double fMax ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE { const SolarMathRoundingMode eRM = SolarMathRoundUp; fMin = SolarMath::Round( fMin, 0, eRM ); @@ -1123,15 +1122,12 @@ double SAL_CALL AnalysisAddIn::getRandbetween( constREFXPS&, double fMin, double } -double SAL_CALL AnalysisAddIn::getGcd( constREFXPS&, const SEQSEQ( double )& aVLst ) THROWDEF_RTE_IAE -//double SAL_CALL AnalysisAddIn::getGcd( constREFXPS&, const SEQ( uno::Any )& aVLst ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getGcd( const SEQSEQ( double )& aVLst, const SEQ( uno::Any )& aOptVLst ) THROWDEF_RTE_IAE { ChkDoubleList1 aValList; - if( !aValList.Append( aVLst ) ) - THROW_IAE; - -// aValList.Append( aVLst ); + aValList.Append( aVLst ); + aValList.Append( aOptVLst ); if( aValList.Count() == 0 ) return 0.0; @@ -1151,12 +1147,12 @@ double SAL_CALL AnalysisAddIn::getGcd( constREFXPS&, const SEQSEQ( double )& aVL } -double SAL_CALL AnalysisAddIn::getLcm( constREFXPS&, const SEQSEQ( double )& aVLst ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getLcm( const SEQSEQ( ANY )& aVLst, const SEQ( uno::Any )& aOptVLst ) THROWDEF_RTE_IAE { - ChkDoubleList1 aValList; + ChkDoubleList2 aValList; - if( !aValList.Append( aVLst ) ) - THROW_IAE; + aValList.Append( aVLst ); + aValList.Append( aOptVLst ); if( aValList.Count() == 0 ) return 0.0; @@ -1164,12 +1160,18 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS&, const SEQSEQ( double )& aVL const double* p = aValList.First(); double f = *p; + if( f == 0.0 ) + return f; + p = aValList.Next(); while( p ) { double fTmp = *p; - f = fTmp * f / GetGcd( fTmp, f ); + if( f == 0.0 ) + return f; + else + f = fTmp * f / GetGcd( fTmp, f ); p = aValList.Next(); } @@ -1177,19 +1179,19 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS&, const SEQSEQ( double )& aVL } -double SAL_CALL AnalysisAddIn::getBesseli( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE { return Bessel( fNum, nOrder, sal_True ); } -double SAL_CALL AnalysisAddIn::getBesselj( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE { return Bessel( fNum, nOrder, sal_False ); } -double SAL_CALL AnalysisAddIn::getBesselk( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE { THROW_IAE; @@ -1200,7 +1202,7 @@ double SAL_CALL AnalysisAddIn::getBesselk( constREFXPS&, double fNum, sal_Int32 } -double SAL_CALL AnalysisAddIn::getBessely( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE { THROW_IAE; @@ -1220,79 +1222,79 @@ double SAL_CALL AnalysisAddIn::getBessely( constREFXPS&, double fNum, sal_Int32 #define DOUBLECONV(from,to) ConvertFromDec(sal_Int64(ConvertToDec(aNum,from,_P)),_MIN##to,_MAX##to,to,nPlaces,_P) -STRING SAL_CALL AnalysisAddIn::getBin2oct( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getBin2oct( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 2, 8 ); } -double SAL_CALL AnalysisAddIn::getBin2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getBin2dec( const STRING& aNum ) THROWDEF_RTE_IAE { return ConvertToDec( aNum, 2, _P ); } -STRING SAL_CALL AnalysisAddIn::getBin2hex( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getBin2hex( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 2, 16 ); } -STRING SAL_CALL AnalysisAddIn::getOct2bin( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getOct2bin( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 8, 2 ); } -double SAL_CALL AnalysisAddIn::getOct2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getOct2dec( const STRING& aNum ) THROWDEF_RTE_IAE { return ConvertToDec( aNum, 8, _P ); } -STRING SAL_CALL AnalysisAddIn::getOct2hex( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getOct2hex( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 8, 16 ); } -STRING SAL_CALL AnalysisAddIn::getDec2bin( constREFXPS&, sal_Int32 nNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getDec2bin( sal_Int32 nNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return ConvertFromDec( nNum, _MIN2, _MAX2, 2, nPlaces, _P ); } -STRING SAL_CALL AnalysisAddIn::getDec2oct( constREFXPS&, sal_Int32 nNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getDec2oct( sal_Int32 nNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return ConvertFromDec( nNum, _MIN8, _MAX8, 8, nPlaces, _P ); } -STRING SAL_CALL AnalysisAddIn::getDec2hex( constREFXPS&, double fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getDec2hex( double fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return ConvertFromDec( sal_Int64( fNum ), _MIN16, _MAX16, 16, nPlaces, _P ); } -STRING SAL_CALL AnalysisAddIn::getHex2bin( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getHex2bin( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 16, 2 ); } -double SAL_CALL AnalysisAddIn::getHex2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getHex2dec( const STRING& aNum ) THROWDEF_RTE_IAE { return ConvertToDec( aNum, 16, _P ); } -STRING SAL_CALL AnalysisAddIn::getHex2oct( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getHex2oct( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE { return DOUBLECONV( 16, 8 ); } -sal_Int32 SAL_CALL AnalysisAddIn::getDelta( constREFXPS&, double fNum1, double fNum2 ) THROWDEF_RTE +sal_Int32 SAL_CALL AnalysisAddIn::getDelta( double fNum1, double fNum2 ) THROWDEF_RTE { #ifdef DEBUG return ( fNum1 == fNum2 )? 1 : 0; @@ -1302,19 +1304,19 @@ sal_Int32 SAL_CALL AnalysisAddIn::getDelta( constREFXPS&, double fNum1, double f } -double SAL_CALL AnalysisAddIn::getErf( constREFXPS&, double fLL, double fUL ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getErf( double fLL, double fUL ) THROWDEF_RTE { return Erf( fUL ) - Erf( fLL ); } -double SAL_CALL AnalysisAddIn::getErfc( constREFXPS&, double f ) THROWDEF_RTE +double SAL_CALL AnalysisAddIn::getErfc( double f ) THROWDEF_RTE { return 1.0 - Erf( f ); } -sal_Int32 SAL_CALL AnalysisAddIn::getGestep( constREFXPS&, double fNum, double fStep ) THROWDEF_RTE +sal_Int32 SAL_CALL AnalysisAddIn::getGestep( double fNum, double fStep ) THROWDEF_RTE { #ifdef DEBUG return ( fNum >= fStep )? 1 : 0; @@ -1324,25 +1326,25 @@ sal_Int32 SAL_CALL AnalysisAddIn::getGestep( constREFXPS&, double fNum, double f } -double SAL_CALL AnalysisAddIn::getFactdouble( constREFXPS&, sal_Int32 nNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE { return FactDouble( nNum ); } -double SAL_CALL AnalysisAddIn::getImabs( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getImabs( const STRING& aNum ) THROWDEF_RTE_IAE { return Complex( aNum ).Abs(); } -double SAL_CALL AnalysisAddIn::getImaginary( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getImaginary( const STRING& aNum ) THROWDEF_RTE_IAE { return Complex( aNum ).Imag(); } -STRING SAL_CALL AnalysisAddIn::getImpower( constREFXPS&, const STRING& aNum, double f ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImpower( const STRING& aNum, double f ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1352,13 +1354,13 @@ STRING SAL_CALL AnalysisAddIn::getImpower( constREFXPS&, const STRING& aNum, dou } -double SAL_CALL AnalysisAddIn::getImargument( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getImargument( const STRING& aNum ) THROWDEF_RTE_IAE { return Complex( aNum ).Arg(); } -STRING SAL_CALL AnalysisAddIn::getImcos( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImcos( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1368,7 +1370,7 @@ STRING SAL_CALL AnalysisAddIn::getImcos( constREFXPS&, const STRING& aNum ) THRO } -STRING SAL_CALL AnalysisAddIn::getImdiv( constREFXPS&, const STRING& aDivid, const STRING& aDivis ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImdiv( const STRING& aDivid, const STRING& aDivis ) THROWDEF_RTE_IAE { Complex z( aDivid ); @@ -1378,7 +1380,7 @@ STRING SAL_CALL AnalysisAddIn::getImdiv( constREFXPS&, const STRING& aDivid, con } -STRING SAL_CALL AnalysisAddIn::getImexp( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImexp( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1388,7 +1390,7 @@ STRING SAL_CALL AnalysisAddIn::getImexp( constREFXPS&, const STRING& aNum ) THRO } -STRING SAL_CALL AnalysisAddIn::getImconjugate( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1398,7 +1400,7 @@ STRING SAL_CALL AnalysisAddIn::getImconjugate( constREFXPS&, const STRING& aNum } -STRING SAL_CALL AnalysisAddIn::getImln( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImln( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1408,7 +1410,7 @@ STRING SAL_CALL AnalysisAddIn::getImln( constREFXPS&, const STRING& aNum ) THROW } -STRING SAL_CALL AnalysisAddIn::getImlog10( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1418,7 +1420,7 @@ STRING SAL_CALL AnalysisAddIn::getImlog10( constREFXPS&, const STRING& aNum ) TH } -STRING SAL_CALL AnalysisAddIn::getImlog2( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1428,8 +1430,7 @@ STRING SAL_CALL AnalysisAddIn::getImlog2( constREFXPS&, const STRING& aNum ) THR } -STRING SAL_CALL AnalysisAddIn::getImproduct( - constREFXPS&, const STRING& aNum1, const SEQ( uno::Any )& aNL ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImproduct( const STRING& aNum1, const SEQ( uno::Any )& aNL ) THROWDEF_RTE_IAE { Complex z( aNum1 ); @@ -1444,13 +1445,13 @@ STRING SAL_CALL AnalysisAddIn::getImproduct( } -double SAL_CALL AnalysisAddIn::getImreal( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getImreal( const STRING& aNum ) THROWDEF_RTE_IAE { return Complex( aNum ).Real(); } -STRING SAL_CALL AnalysisAddIn::getImsin( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImsin( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1460,7 +1461,7 @@ STRING SAL_CALL AnalysisAddIn::getImsin( constREFXPS&, const STRING& aNum ) THRO } -STRING SAL_CALL AnalysisAddIn::getImsub( constREFXPS&, const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE { Complex z( aNum1 ); @@ -1470,8 +1471,7 @@ STRING SAL_CALL AnalysisAddIn::getImsub( constREFXPS&, const STRING& aNum1, cons } -STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const STRING& aNum1, - const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImsum( const STRING& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE { Complex z( aNum1 ); @@ -1486,7 +1486,7 @@ STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const STRING& aNum1, } -STRING SAL_CALL AnalysisAddIn::getImsqrt( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE { Complex z( aNum ); @@ -1496,7 +1496,7 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt( constREFXPS&, const STRING& aNum ) THR } -STRING SAL_CALL AnalysisAddIn::getComplex( constREFXPS&, double fR, double fI, const STRING& rSuff ) THROWDEF_RTE_IAE +STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const STRING& rSuff ) THROWDEF_RTE_IAE { sal_Bool bi = rSuff.compareToAscii( "i" ) == 0; @@ -1507,7 +1507,7 @@ STRING SAL_CALL AnalysisAddIn::getComplex( constREFXPS&, double fR, double fI, c } -double SAL_CALL AnalysisAddIn::getConvert( constREFXPS&, double f, const STRING& aFU, const STRING& aTU ) THROWDEF_RTE_IAE +double SAL_CALL AnalysisAddIn::getConvert( double f, const STRING& aFU, const STRING& aTU ) THROWDEF_RTE_IAE { if( !pCDL ) pCDL = new ConvertDataList(); diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx index 98308ef45b24..4316bf2f208c 100644 --- a/scaddins/source/analysis/analysis.hxx +++ b/scaddins/source/analysis/analysis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: analysis.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2001-05-08 14:55:54 $ + * last change: $Author: gt $ $Date: 2001-05-09 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,80 +132,73 @@ public: virtual sal_Int32 SAL_CALL getWeeknum( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMode ) THROWDEF_RTE; virtual sal_Int32 SAL_CALL getEomonth( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE; virtual sal_Int32 SAL_CALL getNetworkdays( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const SEQSEQ( sal_Int32 )& aHDay ) THROWDEF_RTE; -// virtual sal_Int32 SAL_CALL getNetworkdays( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const CSS::uno::Any& aHDay ) THROWDEF_RTE; - virtual sal_Int32 SAL_CALL getIseven( constREFXPS&, sal_Int32 nVal ) THROWDEF_RTE; - virtual sal_Int32 SAL_CALL getIsodd( constREFXPS&, sal_Int32 nVal ) THROWDEF_RTE; + virtual sal_Int32 SAL_CALL getIseven( sal_Int32 nVal ) THROWDEF_RTE; + virtual sal_Int32 SAL_CALL getIsodd( sal_Int32 nVal ) THROWDEF_RTE; - virtual double SAL_CALL getMultinomial( constREFXPS&, const SEQSEQ( sal_Int32 )& aValueList ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getSeriessum( constREFXPS&, double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE; - virtual double SAL_CALL getQuotient( constREFXPS&, double fNum, double fDenum ) THROWDEF_RTE; + virtual double SAL_CALL getMultinomial( const SEQSEQ( sal_Int32 )& aValueList ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE; + virtual double SAL_CALL getQuotient( double fNum, double fDenum ) THROWDEF_RTE; - virtual double SAL_CALL getMround( constREFXPS&, double fNum, double fMult ) THROWDEF_RTE; - virtual double SAL_CALL getSqrtpi( constREFXPS&, double fNum ) THROWDEF_RTE; + virtual double SAL_CALL getMround( double fNum, double fMult ) THROWDEF_RTE; + virtual double SAL_CALL getSqrtpi( double fNum ) THROWDEF_RTE; - virtual double SAL_CALL getRandbetween( constREFXPS&, double fMin, double fMax ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getGcd( constREFXPS&, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE; -// virtual double SAL_CALL getGcd( constREFXPS&, const SEQ( CSS::uno::Any )& aCoeffList ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getLcm( constREFXPS&, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getGcd( const SEQSEQ( double )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getLcm( const SEQSEQ( ANY )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getBesseli( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getBesselj( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getBesselk( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getBessely( constREFXPS&, double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getBin2oct( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getBin2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getBin2hex( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getBin2oct( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getBin2dec( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getBin2hex( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getOct2bin( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getOct2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getOct2hex( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getOct2bin( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getOct2dec( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getOct2hex( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getDec2bin( constREFXPS&, sal_Int32 fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getDec2oct( constREFXPS&, sal_Int32 fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getDec2hex( constREFXPS&, double fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getDec2bin( sal_Int32 fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getDec2oct( sal_Int32 fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getDec2hex( double fNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getHex2bin( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getHex2dec( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getHex2oct( constREFXPS&, const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getHex2bin( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getHex2dec( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getHex2oct( const STRING& aNum, sal_Int32 nPlaces ) THROWDEF_RTE_IAE; - virtual sal_Int32 SAL_CALL getDelta( constREFXPS&, double fNum1, double fNum2 ) THROWDEF_RTE; + virtual sal_Int32 SAL_CALL getDelta( double fNum1, double fNum2 ) THROWDEF_RTE; - virtual double SAL_CALL getErf( constREFXPS&, double fLowerLimit, double fUpperLimit ) THROWDEF_RTE; - virtual double SAL_CALL getErfc( constREFXPS&, double fLowerLimit ) THROWDEF_RTE; + virtual double SAL_CALL getErf( double fLowerLimit, double fUpperLimit ) THROWDEF_RTE; + virtual double SAL_CALL getErfc( double fLowerLimit ) THROWDEF_RTE; - virtual sal_Int32 SAL_CALL getGestep( constREFXPS&, double fNum, double fStep ) THROWDEF_RTE; + virtual sal_Int32 SAL_CALL getGestep( double fNum, double fStep ) THROWDEF_RTE; - virtual double SAL_CALL getFactdouble( constREFXPS&, sal_Int32 nNum ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getImabs( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getImaginary( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImpower( constREFXPS&, const STRING& aNum, double fPower ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getImargument( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImcos( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImdiv( constREFXPS&, const STRING& aDivident, const STRING& aDivisor ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImexp( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImconjugate( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImln( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImlog10( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImlog2( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; -// virtual STRING SAL_CALL getImproduct( constREFXPS&, const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImproduct( constREFXPS&, const STRING& aNum1, const SEQ_ANY& aNumList ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getImreal( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImsin( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImsub( constREFXPS&, const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE; -// virtual STRING SAL_CALL getImsum( constREFXPS&, const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE; -// virtual STRING SAL_CALL getImsum( constREFXPS&, const SEQSEQ( STRING )& aNumList ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImsum( constREFXPS&, const STRING& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE; -// virtual STRING SAL_CALL getImsum( constREFXPS&, const STRING& aNum1, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getImabs( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getImaginary( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImpower( const STRING& aNum, double fPower ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getImargument( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImcos( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImdiv( const STRING& aDivident, const STRING& aDivisor ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImexp( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImln( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImproduct( const STRING& aNum1, const SEQ_ANY& aNumList ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getImreal( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImsin( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImsum( const STRING& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE; + virtual STRING SAL_CALL getComplex( double fReal, double fImaginary, const STRING& rSuffix ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getImsqrt( constREFXPS&, const STRING& aNum ) THROWDEF_RTE_IAE; - virtual STRING SAL_CALL getComplex( constREFXPS&, double fReal, double fImaginary, const STRING& rSuffix ) THROWDEF_RTE_IAE; - - virtual double SAL_CALL getConvert( constREFXPS&, double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE; + virtual double SAL_CALL getConvert( double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE; virtual double SAL_CALL getAmordegrc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE; virtual double SAL_CALL getAmorlinc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE; diff --git a/scaddins/source/analysis/analysisadd.idl b/scaddins/source/analysis/analysisadd.idl index fce12d0085ea..57f065836cee 100644 --- a/scaddins/source/analysis/analysisadd.idl +++ b/scaddins/source/analysis/analysisadd.idl @@ -2,9 +2,9 @@ * * $RCSfile: analysisadd.idl,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: gt $ $Date: 2001-05-07 06:56:53 $ + * last change: $Author: gt $ $Date: 2001-05-09 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,260 +113,156 @@ module addin long getNetworkdays( [in] com::sun::star::beans::XPropertySet xOptions, [in] long nStartDate, [in] long nEndDate, [in] sequence< sequence<long> > aHolidays ); -// [in] long nStartDate, [in] long nEndDate, [in] any aHolidays ); /// iseven. - long getIseven( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] long nValue ); + long getIseven( [in] long nValue ); /// isodd. - long getIsodd( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] long nValue ); + long getIsodd( [in] long nValue ); /// multinomial. - double getMultinomial( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] sequence< sequence<long> > aValList ); + double getMultinomial( [in] sequence< sequence<long> > aValList ); /// seriessum. - double getSeriessum( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double X, [in] double N, [in] double M, [in] sequence< sequence<double> > CoeffList ); + double getSeriessum( [in] double X, [in] double N, [in] double M, [in] sequence< sequence<double> > CoeffList ); // quotient. - double getQuotient( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] double Denum ); + double getQuotient( [in] double Num, [in] double Denum ); // mround. - double getMround( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Number, [in] double Multiple ); + double getMround( [in] double Number, [in] double Multiple ); // sqrtpi. - double getSqrtpi( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Number ); + double getSqrtpi( [in] double Number ); // randbetween. - double getRandbetween( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Min, [in] double Max ); + double getRandbetween( [in] double Min, [in] double Max ); /// gcd. - double getGcd( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] sequence< sequence<double> > ValList ); -// [in] sequence< any > ValList ); + double getGcd( [in] sequence< sequence<double> > FirstValList, [in] sequence< any > OptionalValList ); /// lcm. - double getLcm( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] sequence< sequence<double> > ValList ); + double getLcm( [in] sequence< sequence< any > > FirstValList, [in] sequence< any > OptionalValList ); /// besseli. - double getBesseli( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] long Order ); + double getBesseli( [in] double Num, [in] long Order ); /// besselj. - double getBesselj( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] long Order ); + double getBesselj( [in] double Num, [in] long Order ); /// besselk. - double getBesselk( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] long Order ); + double getBesselk( [in] double Num, [in] long Order ); /// bessely. - double getBessely( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] long Order ); + double getBessely( [in] double Num, [in] long Order ); /// bin2oct. - string getBin2oct( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string BinaryNum, [in] long nPlaces ); + string getBin2oct( [in] string BinaryNum, [in] long nPlaces ); /// bin2dec. - double getBin2dec( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string BinaryNum ); + double getBin2dec( [in] string BinaryNum ); /// bin2hex. - string getBin2hex( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string BinaryNum, [in] long nPlaces ); + string getBin2hex( [in] string BinaryNum, [in] long nPlaces ); /// oct2bin. - string getOct2bin( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string OctalNum, [in] long nPlaces ); + string getOct2bin( [in] string OctalNum, [in] long nPlaces ); /// oct2dec. - double getOct2dec( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string OctalNum ); + double getOct2dec( [in] string OctalNum ); /// oct2hex. - string getOct2hex( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string OctalNum, [in] long nPlaces ); + string getOct2hex( [in] string OctalNum, [in] long nPlaces ); /// dec2bin. - string getDec2bin( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] long Value, [in] long nPlaces ); + string getDec2bin( [in] long Value, [in] long nPlaces ); /// dec2oct. - string getDec2oct( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] long Value, [in] long nPlaces ); + string getDec2oct( [in] long Value, [in] long nPlaces ); /// dec2hex. - string getDec2hex( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Value, [in] long nPlaces ); + string getDec2hex( [in] double Value, [in] long nPlaces ); /// hex2bin. - string getHex2bin( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string HexadecimalValue, [in] long nPlaces ); + string getHex2bin( [in] string HexadecimalValue, [in] long nPlaces ); /// hex2dec. - double getHex2dec( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string HexadecimalValue ); + double getHex2dec( [in] string HexadecimalValue ); /// hex2oct. - string getHex2oct( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string HexadecimalValue, [in] long nPlaces ); + string getHex2oct( [in] string HexadecimalValue, [in] long nPlaces ); /// delta. - long getDelta( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num1, [in] double Num2 ); + long getDelta( [in] double Num1, [in] double Num2 ); /// erf. - double getErf( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double LowerLimit, [in] double UpperLimit ); + double getErf( [in] double LowerLimit, [in] double UpperLimit ); /// erfc. - double getErfc( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double LowerLimit ); + double getErfc( [in] double LowerLimit ); /// gestep. - long getGestep( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Num, [in] double Step ); + long getGestep( [in] double Num, [in] double Step ); /// factdouble. - double getFactdouble( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] long Num ); + double getFactdouble( [in] long Num ); /// imabs. - double getImabs( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + double getImabs( [in] string Num ); /// imaginary. - double getImaginary( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + double getImaginary( [in] string Num ); /// impower. - string getImpower( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num, [in] double Power ); + string getImpower( [in] string Num, [in] double Power ); /// imargument. - double getImargument( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + double getImargument( [in] string Num ); /// imcos. - string getImcos( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImcos( [in] string Num ); /// imdiv. - string getImdiv( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num1, [in] string Num2 ); + string getImdiv( [in] string Num1, [in] string Num2 ); /// imexp. - string getImexp( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImexp( [in] string Num ); /// imconjugate. - string getImconjugate( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImconjugate( [in] string Num ); /// imln. - string getImln( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImln( [in] string Num ); /// imlog10. - string getImlog10( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImlog10( [in] string Num ); /// imlog2. - string getImlog2( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImlog2( [in] string Num ); /// improduct. - string getImproduct( - [in] com::sun::star::beans::XPropertySet xOptions, -// [in] string Num1, [in] string Num2 ); - [in] string Num1, [in] sequence<any> NumberList ); + string getImproduct( [in] string Num1, [in] sequence<any> NumberList ); /// imreal. - double getImreal( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + double getImreal( [in] string Num ); /// imsin. - string getImsin( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImsin( [in] string Num ); /// imsub. - string getImsub( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num1, [in] string Num2 ); + string getImsub( [in] string Num1, [in] string Num2 ); /// imsum. - string getImsum( - [in] com::sun::star::beans::XPropertySet xOptions, -// [in] string Num1, [in] string Num2 ); - [in] string Num1, [in] sequence<any> OptNums ); + string getImsum( [in] string Num1, [in] sequence<any> OptNums ); /// imsqrt. - string getImsqrt( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] string Num ); + string getImsqrt( [in] string Num ); /// complex. - string getComplex( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Real, [in] double Imaginary, [in] string Suffix ); + string getComplex( [in] double Real, [in] double Imaginary, [in] string Suffix ); /// convert. - double getConvert( - [in] com::sun::star::beans::XPropertySet xOptions, - [in] double Value, [in] string FromUnit, [in] string ToUnit ); + double getConvert( [in] double Value, [in] string FromUnit, [in] string ToUnit ); /// amordegrc. diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 75294dfcc23f..849be878690b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: analysishelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nn $ $Date: 2001-05-08 15:27:45 $ + * last change: $Author: gt $ $Date: 2001-05-09 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -252,7 +252,7 @@ sal_Int32 GetNullDate( constREFXPS& xOpt ) THROWDEF_RTE { try { - uno::Any aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) ); + ANY aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) ); util::Date aDate; if( aAny >>= aDate ) return DateToDays( aDate.Day, aDate.Month, aDate.Year ); @@ -1118,7 +1118,7 @@ inline double Exp10( sal_Int16 n ) } -sal_Int32 GetOpt( const CSS::uno::Any& rAny, sal_Int32 nDefault ) THROWDEF_RTE_IAE +sal_Int32 GetOpt( const ANY& rAny, sal_Int32 nDefault ) THROWDEF_RTE_IAE { switch( rAny.getValueTypeClass() ) { @@ -1136,7 +1136,7 @@ sal_Int32 GetOpt( const CSS::uno::Any& rAny, sal_Int32 nDefault ) THROWDEF_RTE_I } -double GetOpt( const CSS::uno::Any& rAny, double fDefault ) THROWDEF_RTE_IAE +double GetOpt( const ANY& rAny, double fDefault ) THROWDEF_RTE_IAE { switch( rAny.getValueTypeClass() ) { @@ -1680,7 +1680,7 @@ void SortedIndividualInt32List::InsertHolidayList( const SEQ( double )& aHD, sal void SortedIndividualInt32List::InsertHolidayList( - const uno::Any& aHDay, sal_Int32 nNullDate, sal_Bool bInsOnWE ) THROWDEF_RTE_IAE + const ANY& aHDay, sal_Int32 nNullDate, sal_Bool bInsOnWE ) THROWDEF_RTE_IAE { switch( aHDay.getValueTypeClass() ) { @@ -1703,15 +1703,15 @@ void SortedIndividualInt32List::InsertHolidayList( break; case uno::TypeClass_SEQUENCE: { - SEQSEQ( uno::Any ) aValArr; + SEQSEQ( ANY ) aValArr; if( aHDay >>= aValArr ) { - sal_Int32 nE = aValArr.getLength(); - const SEQ( uno::Any )* pArr = aValArr.getConstArray(); + sal_Int32 nE = aValArr.getLength(); + const SEQ( ANY )* pArr = aValArr.getConstArray(); for( sal_Int32 n = 0 ; n < nE ; n++ ) { - sal_Int32 nF = pArr[ n ].getLength(); - const uno::Any* pAny = pArr[ n ].getConstArray(); + sal_Int32 nF = pArr[ n ].getLength(); + const ANY* pAny = pArr[ n ].getConstArray(); for( sal_Int32 m = 0 ; m < nF ; m++ ) InsertHolidayList( pAny[ m ], nNullDate, bInsOnWE ); @@ -1730,6 +1730,47 @@ void SortedIndividualInt32List::InsertHolidayList( +inline void DoubleList::AppendVoid( sal_Bool bErrOnEmpty ) THROWDEF_RTE_IAE +{ + if( bErrOnEmpty ) + THROW_IAE; +} + + +inline void DoubleList::AppendDouble( double f ) THROWDEF_RTE_IAE +{ + if( IsFaulty( f ) ) + THROW_IAE; + if( IsProper( f ) ) + _Append( f ); +} + + +void DoubleList::AppendString( const ANY& r, sal_Bool bEmptyAs0 ) THROWDEF_RTE_IAE +{ + if( bEmptyAs0 || ( ( const STRING* ) r.getValue() )->len() ) + AppendDouble( 0.0 ); + else + THROW_IAE; +} + + +void DoubleList::AppendDouble( const ANY& r ) THROWDEF_RTE_IAE +{ + double f = *( double* ) r.getValue(); + if( IsFaulty( f ) ) + THROW_IAE; + if( IsProper( f ) ) + _Append( f ); +} + + +inline void DoubleList::AppendAnyArray2( const ANY& r ) THROWDEF_RTE_IAE +{ + Append( *( const SEQSEQ( ANY )* ) r.getValue() ); +} + + DoubleList::~DoubleList() { for( double* p = ( double* ) List::First(); p ; p = ( double* ) List::Next() ) @@ -1737,12 +1778,11 @@ DoubleList::~DoubleList() } -sal_Bool DoubleList::Append( const SEQSEQ( double )& aVLst ) +void DoubleList::Append( const SEQSEQ( double )& aVLst ) THROWDEF_RTE_IAE { sal_Int32 n1, n2; sal_Int32 nE1 = aVLst.getLength(); sal_Int32 nE2; - sal_Int32 nZ = 0; for( n1 = 0 ; n1 < nE1 ; n1++ ) { @@ -1751,62 +1791,26 @@ sal_Bool DoubleList::Append( const SEQSEQ( double )& aVLst ) const double* pList = rList.getConstArray(); for( n2 = 0 ; n2 < nE2 ; n2++ ) - { - double f = pList[ n2 ]; - if( IsFaulty( f ) ) - return sal_False; - if( IsProper( f ) ) - _Append( f ); - } + AppendDouble( pList[ n2 ] ); } - - return sal_True; } -void DoubleList::Append( const SEQ( uno::Any )& aVList, sal_Bool bEmptyAs0, sal_Bool bErrOnEmpty ) THROWDEF_RTE_IAE +void DoubleList::Append( const SEQ( ANY )& aVList, sal_Bool bEmptyAs0, sal_Bool bErrOnEmpty ) THROWDEF_RTE_IAE { sal_Int32 nE = aVList.getLength(); - sal_Int32 nZ = 0; - const uno::Any* pList = aVList.getConstArray(); + const ANY* pList = aVList.getConstArray(); for( sal_Int32 n = 0 ; n < nE ; n++ ) { - const uno::Any& r = pList[ n ]; + const ANY& r = pList[ n ]; switch( r.getValueTypeClass() ) { - case uno::TypeClass_VOID: - if( bErrOnEmpty ) - THROW_IAE; - break; - case uno::TypeClass_STRING: - if( bEmptyAs0 ) - { - if( ( ( const STRING* ) r.getValue() )->len() ) - THROW_IAE; - - const double f = 0.0; - if( IsFaulty( f ) ) - THROW_IAE; - if( IsProper( f ) ) - _Append( f ); - } - else - THROW_IAE; - break; - case uno::TypeClass_DOUBLE: - { - double f = *( double* ) r.getValue(); - if( IsFaulty( f ) ) - THROW_IAE; - if( IsProper( f ) ) - _Append( f ); - } - break; - case uno::TypeClass_SEQUENCE: - Append( *( const SEQ( uno::Any )* ) r.getValue() ); - break; + case uno::TypeClass_VOID: AppendVoid( bErrOnEmpty ); break; + case uno::TypeClass_STRING: AppendString( r, bEmptyAs0 ); break; + case uno::TypeClass_DOUBLE: AppendDouble( r ); break; + case uno::TypeClass_SEQUENCE: AppendAnyArray2( r ); break; default: THROW_IAE; } @@ -1814,6 +1818,33 @@ void DoubleList::Append( const SEQ( uno::Any )& aVList, sal_Bool bEmptyAs0, sal_ } +void DoubleList::Append( const SEQSEQ( ANY )& aVArr, sal_Bool bEmptyAs0, sal_Bool bErrOnEmpty ) THROWDEF_RTE_IAE +{ + sal_Int32 nE1 = aVArr.getLength(); + + for( sal_Int32 n1 = 0 ; n1 < nE1 ; n1++ ) + { + const SEQ( ANY )& rVList = aVArr[ n1 ]; + sal_Int32 nE = rVList.getLength(); + const ANY* pList = rVList.getConstArray(); + + for( sal_Int32 n = 0 ; n < nE ; n++ ) + { + const ANY& r = pList[ n ]; + + switch( r.getValueTypeClass() ) + { + case uno::TypeClass_VOID: AppendVoid( bErrOnEmpty ); break; + case uno::TypeClass_STRING: AppendString( r, bEmptyAs0 ); break; + case uno::TypeClass_DOUBLE: AppendDouble( r ); break; + default: + THROW_IAE; + } + } + } +} + + sal_Bool DoubleList::IsProper( double ) const { return sal_True; @@ -1833,6 +1864,7 @@ sal_Bool ChkDoubleList1::IsProper( double f ) const return f > 0.0; } + sal_Bool ChkDoubleList1::IsFaulty( double f ) const { return f < 0.0; @@ -1841,6 +1873,20 @@ sal_Bool ChkDoubleList1::IsFaulty( double f ) const +sal_Bool ChkDoubleList2::IsProper( double f ) const +{ + return f >= 0.0; +} + + +sal_Bool ChkDoubleList2::IsFaulty( double f ) const +{ + return f < 0.0; +} + + + + Complex::Complex( const STRING& r ) THROWDEF_RTE_IAE { if( !ParseString( r, *this ) ) @@ -2062,13 +2108,13 @@ void ComplexList::Append( const SEQSEQ( STRING )& r, sal_Bool bEmpty0 ) THROWDEF } -void ComplexList::Append( const SEQ( uno::Any )& aMultPars, sal_Bool bEmpty0 ) THROWDEF_RTE_IAE +void ComplexList::Append( const SEQ( ANY )& aMultPars, sal_Bool bEmpty0 ) THROWDEF_RTE_IAE { sal_Int32 nE = aMultPars.getLength(); for( sal_Int32 n = 0 ; n < nE ; n++ ) { - const uno::Any& r = aMultPars[ n ]; + const ANY& r = aMultPars[ n ]; switch( r.getValueTypeClass() ) { case uno::TypeClass_VOID: break; @@ -2089,11 +2135,11 @@ void ComplexList::Append( const SEQ( uno::Any )& aMultPars, sal_Bool bEmpty0 ) T break; case uno::TypeClass_SEQUENCE: { - SEQSEQ( uno::Any ) aValArr; + SEQSEQ( ANY ) aValArr; if( r >>= aValArr ) { - sal_Int32 nE = aValArr.getLength(); - const SEQ( uno::Any )* pArr = aValArr.getConstArray(); + sal_Int32 nE = aValArr.getLength(); + const SEQ( ANY )* pArr = aValArr.getConstArray(); for( sal_Int32 n = 0 ; n < nE ; n++ ) Append( pArr[ n ], bEmpty0 ); } diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index a2b69a0ba12e..8ff3de6e023c 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: analysishelper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: gt $ $Date: 2001-05-08 12:20:21 $ + * last change: $Author: gt $ $Date: 2001-05-09 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -298,7 +298,7 @@ public: const SEQ( double )& aHDay, sal_Int32 nNullDate, sal_Bool bInsertAlsoOnWeekends ) THROWDEF_RTE_IAE; void InsertHolidayList( - const CSS::uno::Any& aHDay, + const ANY& aHDay, sal_Int32 nNullDate, sal_Bool bInsertAlsoOnWeekends ) THROWDEF_RTE_IAE; }; @@ -309,6 +309,11 @@ class DoubleList : protected List { protected: inline void _Append( double fVal ); + inline void AppendVoid( sal_Bool bForceErrorOnEmpty ) THROWDEF_RTE_IAE; + inline void AppendDouble( double fVal ) THROWDEF_RTE_IAE; + void AppendString( const ANY& r, sal_Bool bEmptyStringAs0 ) THROWDEF_RTE_IAE; + void AppendDouble( const ANY& r ) THROWDEF_RTE_IAE; + inline void AppendAnyArray2( const ANY& r ) THROWDEF_RTE_IAE; public: virtual ~DoubleList(); @@ -319,17 +324,18 @@ public: List::Count; - inline sal_Bool Append( double fVal ); - sal_Bool Append( const SEQSEQ( double )& aValList ); - // return = FALSE if one or more values don't match IsValid() - // but, even if an error occur, the list might be changed! - void Append( const SEQ( CSS::uno::Any )& aValList, + sal_Bool Append( double fVal ); + void Append( const SEQSEQ( double )& aValList ) THROWDEF_RTE_IAE; + void Append( const SEQ( ANY )& aValList, sal_Bool bEmptyStringAs0 = sal_True, sal_Bool bForceErrorOnEmpty = sal_False ) THROWDEF_RTE_IAE; // when bEmptyStringAs0, no empty entry is possible as result -> // bForceErrorOnEmpty has no effect, but an exception is thrown, // when the string is _not_ empty // when bForceErrorOnEmpty, no voids and empty strings are allowed + void Append( const SEQSEQ( ANY )& aValList, + sal_Bool bEmptyStringAs0 = sal_True, + sal_Bool bForceErrorOnEmpty = sal_False ) THROWDEF_RTE_IAE; virtual sal_Bool IsProper( double fVal ) const; virtual sal_Bool IsFaulty( double fVal ) const; }; @@ -338,7 +344,17 @@ public: class ChkDoubleList1 : public DoubleList -{ +{// proper values are > 0.0 +public: + virtual sal_Bool IsProper( double fVal ) const; + virtual sal_Bool IsFaulty( double fVal ) const; +}; + + + + +class ChkDoubleList2 : public DoubleList +{ // proper values are >= 0.0 public: virtual sal_Bool IsProper( double fVal ) const; virtual sal_Bool IsFaulty( double fVal ) const; @@ -400,7 +416,7 @@ public: inline void Append( Complex* pNew ); void Append( const SEQSEQ( STRING )& rComplexNumList, sal_Bool bEmptyStringAs0 = sal_True ) THROWDEF_RTE_IAE; - void Append( const SEQ( uno::Any )& aMultPars, + void Append( const SEQ( ANY )& aMultPars, sal_Bool bEmptyStringAs0 = sal_True ) THROWDEF_RTE_IAE; }; @@ -591,7 +607,6 @@ inline sal_uInt32 List::Count( void ) const inline void CStrList::Append( const sal_Char* p ) { -// List::Insert( ( void* ) p, LIST_APPEND ); List::Append( ( void* ) p ); } @@ -606,7 +621,6 @@ inline const sal_Char* CStrList::Get( sal_uInt32 n ) const inline void FuncDataList::Append( FuncData* p ) { -// List::Insert( p, LIST_APPEND ); List::Append( p ); } @@ -629,7 +643,6 @@ inline sal_Int32 SortedIndividualInt32List::Get( sal_uInt32 n ) const inline void DoubleList::_Append( double f ) { -// List::Insert( new double( f ), LIST_APPEND ); List::Append( new double( f ) ); } |