summaryrefslogtreecommitdiff
path: root/scaddins/source/analysis/analysis.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /scaddins/source/analysis/analysis.cxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 737b6a92adca9a8285370918671b93b56a028537 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:21 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e Author: Jani Monoses <jani.monoses@canonical.com> Date: Thu Jan 27 15:33:06 2011 +0200 Remove unused declaration Signed-off-by: Michael Meeks <michael.meeks@novell.com> sc/source/core/tool/token.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 96bee1507119ca0525845022019d90f0694996aa Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 20 23:44:52 2011 -0500 Fixed incorrect page number in page preview mode. (fdo#33155) When the window is large enough to show several 'Page X' strings, the page number was not properly incremented. This commit fixes it. sc/source/ui/view/gridwin4.cxx | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83 Author: Kohei Yoshida <kyoshida@novell.com> Date: Wed Jan 19 00:24:24 2011 -0500 Fixed incorrect import of cell attributes from Excel documents. When a cell with non-default formatting attribute starts with non-first row in a column, the filter would incorrectly apply the same format to all the cells above it if they didn't have any formats. This commit fixes it. sc/source/filter/excel/xistyle.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit af63319fcdeea3f9b5018eab83ef5a9e64905446 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 5ada5635cff38af87830b091b36159cf80e4cf5d Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit c900e3db767518b7a60eaf24bdf298c94315f685 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 15d298ba7c4e89b043b3077e17747ba027a62c43 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: calc_libreoffice-3.3.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'scaddins/source/analysis/analysis.cxx')
-rw-r--r--scaddins/source/analysis/analysis.cxx248
1 files changed, 124 insertions, 124 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 050feef7dc8b..ea1494cb349b 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@
#include "analysis.hrc"
#include "bessel.hxx"
-#define ADDIN_SERVICE "com.sun.star.sheet.AddIn"
-#define MY_SERVICE "com.sun.star.sheet.addin.Analysis"
-#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
+#define ADDIN_SERVICE "com.sun.star.sheet.AddIn"
+#define MY_SERVICE "com.sun.star.sheet.addin.Analysis"
+#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
using namespace ::rtl;
using namespace ::com::sun::star;
//------------------------------------------------------------------
//
-// entry points for service registration / instantiation
+// entry points for service registration / instantiation
//
//------------------------------------------------------------------
@@ -67,15 +67,15 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, registry::XReg
{
try
{
- STRING aImpl = STRFROMASCII( "/" );
+ STRING aImpl = STRFROMASCII( "/" );
aImpl += AnalysisAddIn::getImplementationName_Static();
aImpl += STRFROMASCII( "/UNO/SERVICES" );
- REF( registry::XRegistryKey ) xNewKey(
+ REF( registry::XRegistryKey ) xNewKey(
reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( aImpl ) );
- SEQ( STRING ) aSequ = AnalysisAddIn::getSupportedServiceNames_Static();
- const STRING* pArray = aSequ.getConstArray();
+ SEQ( STRING ) aSequ = AnalysisAddIn::getSupportedServiceNames_Static();
+ const STRING* pArray = aSequ.getConstArray();
for( sal_Int32 i = 0 ; i < aSequ.getLength() ; i++ )
xNewKey->createKey( pArray[ i ] );
@@ -93,11 +93,11 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, registry::XReg
void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
- void* pRet = 0;
+ void* pRet = 0;
if( pServiceManager && STRING::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
{
- REF( lang::XSingleServiceFactory ) xFactory( cppu::createOneInstanceFactory(
+ REF( lang::XSingleServiceFactory ) xFactory( cppu::createOneInstanceFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
AnalysisAddIn::getImplementationName_Static(),
AnalysisAddIn_CreateInstance,
@@ -114,14 +114,14 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceMa
}
-} // extern C
+} // extern C
//------------------------------------------------------------------------
//
-// "normal" service implementation
+// "normal" service implementation
//
//------------------------------------------------------------------------
@@ -130,7 +130,7 @@ ResMgr& AnalysisAddIn::GetResMgr( void ) THROWDEF_RTE
{
if( !pResMgr )
{
- InitData(); // try to get resource manager
+ InitData(); // try to get resource manager
if( !pResMgr )
THROW_RTE;
@@ -150,8 +150,8 @@ class AnalysisResourcePublisher : public Resource
{
public:
AnalysisResourcePublisher( const AnalysisResId& rId ) : Resource( rId ) {}
- BOOL IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
- void FreeResource() { Resource::FreeResource(); }
+ BOOL IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
+ void FreeResource() { Resource::FreeResource(); }
};
@@ -172,13 +172,13 @@ AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd,
STRING AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE
{
- STRING aRet;
- AnalysisResourcePublisher aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
- AnalysisResId aRes( nResId, GetResMgr() );
+ STRING aRet;
+ AnalysisResourcePublisher aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
+ AnalysisResId aRes( nResId, GetResMgr() );
aRes.SetRT( RSC_RESOURCE );
if( aResPubl.IsAvailableRes( aRes ) )
{
- AnalysisFuncRes aSubRes( aRes, GetResMgr(), nStrIndex, aRet );
+ AnalysisFuncRes aSubRes( aRes, GetResMgr(), nStrIndex, aRet );
}
aResPubl.FreeResource();
@@ -192,7 +192,7 @@ void AnalysisAddIn::InitData( void )
if( pResMgr )
delete pResMgr;
- OString aModName( "analysis" );
+ OString aModName( "analysis" );
pResMgr = ResMgr::CreateResMgr( ( const sal_Char* ) aModName,
aFuncLoc );
@@ -234,8 +234,8 @@ AnalysisAddIn::~AnalysisAddIn()
if( pCDL )
delete pCDL;
-// if( pResMgr ) no delete, because _all_ resource managers are deleted _before_ this dtor is called
-// delete pResMgr;
+// if( pResMgr ) no delete, because _all_ resource managers are deleted _before_ this dtor is called
+// delete pResMgr;
if( pDefLocales )
delete[] pDefLocales;
@@ -257,7 +257,7 @@ sal_Int32 AnalysisAddIn::getDateMode(
//-----------------------------------------------------------------------------
-#define MAXFACTDOUBLE 300
+#define MAXFACTDOUBLE 300
double AnalysisAddIn::FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
{
@@ -268,17 +268,17 @@ double AnalysisAddIn::FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
{
pFactDoubles = new double[ MAXFACTDOUBLE + 1 ];
- pFactDoubles[ 0 ] = 1.0; // by default
+ pFactDoubles[ 0 ] = 1.0; // by default
- double fOdd = 1.0;
- double fEven = 2.0;
+ double fOdd = 1.0;
+ double fEven = 2.0;
pFactDoubles[ 1 ] = fOdd;
pFactDoubles[ 2 ] = fEven;
- sal_Bool bOdd = sal_True;
+ sal_Bool bOdd = sal_True;
- for( sal_uInt16 nCnt = 3 ; nCnt <= MAXFACTDOUBLE ; nCnt++ )
+ for( sal_uInt16 nCnt = 3 ; nCnt <= MAXFACTDOUBLE ; nCnt++ )
{
if( bOdd )
{
@@ -308,8 +308,8 @@ STRING AnalysisAddIn::getImplementationName_Static()
SEQ( STRING ) AnalysisAddIn::getSupportedServiceNames_Static()
{
- SEQ( STRING ) aRet(2);
- STRING* pArray = aRet.getArray();
+ SEQ( STRING ) aRet(2);
+ STRING* pArray = aRet.getArray();
pArray[0] = STRFROMASCII( ADDIN_SERVICE );
pArray[1] = STRFROMASCII( MY_SERVICE );
return aRet;
@@ -359,7 +359,7 @@ void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale ) THROWDEF_R
{
aFuncLoc = eLocale;
- InitData(); // change of locale invalidates resources!
+ InitData(); // change of locale invalidates resources!
}
lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
@@ -372,8 +372,8 @@ lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
STRING SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const STRING& ) THROWDEF_RTE
{
- // not used by calc
- // (but should be implemented for other uses of the AddIn service)
+ // not used by calc
+ // (but should be implemented for other uses of the AddIn service)
return STRING();
}
@@ -381,9 +381,9 @@ STRING SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const STRING& ) THROW
STRING SAL_CALL AnalysisAddIn::getDisplayFunctionName( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( p )
{
aRet = GetDisplFuncStr( p->GetUINameID() );
@@ -402,9 +402,9 @@ STRING SAL_CALL AnalysisAddIn::getDisplayFunctionName( const STRING& aProgrammat
STRING SAL_CALL AnalysisAddIn::getFunctionDescription( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( p )
aRet = GetFuncDescrStr( p->GetDescrID(), 1 );
@@ -414,12 +414,12 @@ STRING SAL_CALL AnalysisAddIn::getFunctionDescription( const STRING& aProgrammat
STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_Int32 nArg ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aName );
+ const FuncData* p = pFD->Get( aName );
if( p && nArg <= 0xFFFF )
{
- sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
+ sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
if( nStr /*&& nStr < 4*/ )
aRet = GetFuncDescrStr( p->GetDescrID(), nStr );
else
@@ -432,12 +432,12 @@ STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_
STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_Int32 nArg ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aName );
+ const FuncData* p = pFD->Get( aName );
if( p && nArg <= 0xFFFF )
{
- sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
+ sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
if( nStr /*&& nStr < 4*/ )
aRet = GetFuncDescrStr( p->GetDescrID(), nStr + 1 );
else
@@ -448,28 +448,28 @@ STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_
}
-static const char* pDefCatName = "Add-In";
+static const char* pDefCatName = "Add-In";
STRING SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const STRING& aName ) THROWDEF_RTE
{
- // return non-translated strings
-// return STRFROMASCII( "Add-In" );
- const FuncData* p = pFD->Get( aName );
- STRING aRet;
+ // return non-translated strings
+// return STRFROMASCII( "Add-In" );
+ const FuncData* p = pFD->Get( aName );
+ STRING aRet;
if( p )
{
- const sal_Char* pStr;
+ const sal_Char* pStr;
switch( p->GetCategory() )
{
- case FDCat_DateTime: pStr = "Date&Time"; break;
- case FDCat_Finance: pStr = "Financial"; break;
- case FDCat_Inf: pStr = "Information"; break;
- case FDCat_Math: pStr = "Mathematical"; break;
- case FDCat_Tech: pStr = "Technical"; break;
+ case FDCat_DateTime: pStr = "Date&Time"; break;
+ case FDCat_Finance: pStr = "Financial"; break;
+ case FDCat_Inf: pStr = "Information"; break;
+ case FDCat_Math: pStr = "Mathematical"; break;
+ case FDCat_Tech: pStr = "Technical"; break;
default:
- pStr = pDefCatName; break;
+ pStr = pDefCatName; break;
}
aRet = STRFROMASCII( pStr );
@@ -483,23 +483,23 @@ STRING SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const STRING& aName
STRING SAL_CALL AnalysisAddIn::getDisplayCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE
{
- // return translated strings, not used for predefined categories
-// return STRFROMASCII( "Add-In" );
- const FuncData* p = pFD->Get( aProgrammaticFunctionName );
- STRING aRet;
+ // return translated strings, not used for predefined categories
+// return STRFROMASCII( "Add-In" );
+ const FuncData* p = pFD->Get( aProgrammaticFunctionName );
+ STRING aRet;
if( p )
{
- const sal_Char* pStr;
+ const sal_Char* pStr;
switch( p->GetCategory() )
{
- case FDCat_DateTime: pStr = "Date&Time"; break;
- case FDCat_Finance: pStr = "Financial"; break;
- case FDCat_Inf: pStr = "Information"; break;
- case FDCat_Math: pStr = "Mathematical"; break;
- case FDCat_Tech: pStr = "Technical"; break;
+ case FDCat_DateTime: pStr = "Date&Time"; break;
+ case FDCat_Finance: pStr = "Financial"; break;
+ case FDCat_Inf: pStr = "Information"; break;
+ case FDCat_Math: pStr = "Mathematical"; break;
+ case FDCat_Tech: pStr = "Technical"; break;
default:
- pStr = pDefCatName; break;
+ pStr = pDefCatName; break;
}
aRet = STRFROMASCII( pStr );
@@ -511,9 +511,9 @@ STRING SAL_CALL AnalysisAddIn::getDisplayCategoryName( const STRING& aProgrammat
}
-static const sal_Char* pLang[] = { "de", "en" };
-static const sal_Char* pCoun[] = { "DE", "US" };
-static const sal_uInt32 nNumOfLoc = sizeof( pLang ) / sizeof( sal_Char* );
+static const sal_Char* pLang[] = { "de", "en" };
+static const sal_Char* pCoun[] = { "DE", "US" };
+static const sal_uInt32 nNumOfLoc = sizeof( pLang ) / sizeof( sal_Char* );
void AnalysisAddIn::InitDefLocales( void )
@@ -542,17 +542,17 @@ inline const CSS::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( !p )
return SEQofLocName( 0 );
- const StringList& r = p->GetCompNameList();
- sal_uInt32 nCount = r.Count();
+ const StringList& r = p->GetCompNameList();
+ sal_uInt32 nCount = r.Count();
- SEQofLocName aRet( nCount );
+ SEQofLocName aRet( nCount );
- CSS::sheet::LocalizedName* pArray = aRet.getArray();
+ CSS::sheet::LocalizedName* pArray = aRet.getArray();
for( sal_uInt32 n = 0 ; n < nCount ; n++ )
{
@@ -582,13 +582,13 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
if( !nDays )
return nDate;
- sal_Int32 nNullDate = GetNullDate( xOptions );
+ sal_Int32 nNullDate = GetNullDate( xOptions );
- SortedIndividualInt32List aSrtLst;
+ SortedIndividualInt32List aSrtLst;
aSrtLst.InsertHolidayList( aAnyConv, xOptions, aHDay, nNullDate, sal_False );
- sal_Int32 nActDate = nDate + nNullDate;
+ sal_Int32 nActDate = nDate + nNullDate;
if( nDays > 0 )
{
@@ -606,7 +606,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
nDays--;
}
else
- nActDate++; // jump over weekend
+ nActDate++; // jump over weekend
}
}
else
@@ -625,7 +625,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
nDays++;
}
else
- nActDate--; // jump over weekend
+ nActDate--; // jump over weekend
}
}
@@ -658,11 +658,11 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate
{
nDate += GetNullDate( xOpt );
- sal_uInt16 nDay, nMonth, nYear;
+ sal_uInt16 nDay, nMonth, nYear;
DaysToDate( nDate, nDay, nMonth, nYear );
- sal_Int32 nFirstInYear = DateToDays( 1, 1, nYear );
- sal_uInt16 nFirstDayInYear = GetDayOfWeek( nFirstInYear );
+ sal_Int32 nFirstInYear = DateToDays( 1, 1, nYear );
+ sal_uInt16 nFirstDayInYear = GetDayOfWeek( nFirstInYear );
return ( nDate - nFirstInYear + ( ( nMode == 1 )? ( nFirstDayInYear + 1 ) % 7 : nFirstDayInYear ) ) / 7 + 1;
}
@@ -670,12 +670,12 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate
sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE
{
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
nDate += nNullDate;
- sal_uInt16 nDay, nMonth, nYear;
+ sal_uInt16 nDay, nMonth, nYear;
DaysToDate( nDate, nDay, nMonth, nYear );
- sal_Int32 nNewMonth = nMonth + nMonths;
+ sal_Int32 nNewMonth = nMonth + nMonths;
if( nNewMonth > 12 )
{
@@ -698,15 +698,15 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate
sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( constREFXPS& xOpt,
sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE
{
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
- SortedIndividualInt32List aSrtLst;
+ SortedIndividualInt32List aSrtLst;
aSrtLst.InsertHolidayList( aAnyConv, xOpt, aHDay, nNullDate, sal_False );
- sal_Int32 nActDate = nStartDate + nNullDate;
- sal_Int32 nStopDate = nEndDate + nNullDate;
- sal_Int32 nCnt = 0;
+ sal_Int32 nActDate = nStartDate + nNullDate;
+ sal_Int32 nStopDate = nEndDate + nNullDate;
+ sal_Int32 nCnt = 0;
if( nActDate <= nStopDate )
{
@@ -782,7 +782,7 @@ AnalysisAddIn::getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVL
double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE
{
- double fRet = 0.0;
+ double fRet = 0.0;
// #i32269# 0^0 is undefined, Excel returns #NUM! error
if( fX == 0.0 && fN == 0 )
@@ -790,16 +790,16 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
if( fX != 0.0 )
{
- sal_Int32 n1, n2;
- sal_Int32 nE1 = aCoeffList.getLength();
- sal_Int32 nE2;
- //sal_Int32 nZ = 0;
+ sal_Int32 n1, n2;
+ sal_Int32 nE1 = aCoeffList.getLength();
+ sal_Int32 nE2;
+ //sal_Int32 nZ = 0;
for( n1 = 0 ; n1 < nE1 ; n1++ )
{
- const SEQ( double )& rList = aCoeffList[ n1 ];
+ const SEQ( double )& rList = aCoeffList[ n1 ];
nE2 = rList.getLength();
- const double* pList = rList.getConstArray();
+ const double* pList = rList.getConstArray();
for( n2 = 0 ; n2 < nE2 ; n2++ )
{
@@ -869,8 +869,8 @@ double SAL_CALL AnalysisAddIn::getGcd( constREFXPS& xOpt, const SEQSEQ( double )
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
+ const double* p = aValList.First();
+ double f = *p;
p = aValList.Next();
@@ -894,8 +894,8 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
+ const double* p = aValList.First();
+ double f = *p;
if( f == 0.0 )
return f;
@@ -904,7 +904,7 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )
while( p )
{
- double fTmp = *p;
+ double fTmp = *p;
if( f == 0.0 )
return f;
else
@@ -945,7 +945,7 @@ double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROW
if( nOrder < 0 || fNum <= 0.0 )
THROW_IAE;
-// return yn( nOrder, fNum );
+// return yn( nOrder, fNum );
double fRet = sca::analysis::BesselY( fNum, nOrder );
RETURN_FINITE( fRet );
}
@@ -1111,7 +1111,7 @@ double SAL_CALL AnalysisAddIn::getImaginary( const STRING& aNum ) THROWDEF_RTE_I
STRING SAL_CALL AnalysisAddIn::getImpower( const STRING& aNum, double f ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Power( f );
@@ -1128,7 +1128,7 @@ double SAL_CALL AnalysisAddIn::getImargument( const STRING& aNum ) THROWDEF_RTE_
STRING SAL_CALL AnalysisAddIn::getImcos( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Cos();
@@ -1138,7 +1138,7 @@ STRING SAL_CALL AnalysisAddIn::getImcos( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImdiv( const STRING& aDivid, const STRING& aDivis ) THROWDEF_RTE_IAE
{
- Complex z( aDivid );
+ Complex z( aDivid );
z.Div( Complex( aDivis ) );
@@ -1148,7 +1148,7 @@ STRING SAL_CALL AnalysisAddIn::getImdiv( const STRING& aDivid, const STRING& aDi
STRING SAL_CALL AnalysisAddIn::getImexp( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Exp();
@@ -1158,7 +1158,7 @@ STRING SAL_CALL AnalysisAddIn::getImexp( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Conjugate();
@@ -1168,7 +1168,7 @@ STRING SAL_CALL AnalysisAddIn::getImconjugate( const STRING& aNum ) THROWDEF_RTE
STRING SAL_CALL AnalysisAddIn::getImln( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Ln();
@@ -1178,7 +1178,7 @@ STRING SAL_CALL AnalysisAddIn::getImln( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Log10();
@@ -1188,7 +1188,7 @@ STRING SAL_CALL AnalysisAddIn::getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Log2();
@@ -1198,17 +1198,17 @@ STRING SAL_CALL AnalysisAddIn::getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImproduct( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( uno::Any )& aNL ) THROWDEF_RTE_IAE
{
- ComplexList z_list;
+ ComplexList z_list;
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aNL, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
+ const Complex* p = z_list.First();
if( !p )
return Complex( 0 ).GetString();
- Complex z( *p );
+ Complex z( *p );
for( p = z_list.Next() ; p ; p = z_list.Next() )
z.Mult( *p );
@@ -1226,7 +1226,7 @@ double SAL_CALL AnalysisAddIn::getImreal( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImsin( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Sin();
@@ -1236,7 +1236,7 @@ STRING SAL_CALL AnalysisAddIn::getImsin( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE
{
- Complex z( aNum1 );
+ Complex z( aNum1 );
z.Sub( Complex( aNum2 ) );
@@ -1246,17 +1246,17 @@ STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum
STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
{
- ComplexList z_list;
+ ComplexList z_list;
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aFollowingPars, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
+ const Complex* p = z_list.First();
if( !p )
return Complex( 0 ).GetString();
- Complex z( *p );
+ Complex z( *p );
for( p = z_list.Next() ; p ; p = z_list.Next() )
z.Add( *p );
@@ -1267,9 +1267,9 @@ STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& a
STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
-// z.Power( 0.5 );
+// z.Power( 0.5 );
z.Sqrt();
return z.GetString();
@@ -1278,7 +1278,7 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuff ) THROWDEF_RTE_IAE
{
- sal_Bool bi;
+ sal_Bool bi;
switch( rSuff.getValueTypeClass() )
{
@@ -1287,7 +1287,7 @@ STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuf
break;
case uno::TypeClass_STRING:
{
- const STRING* pSuff = ( const STRING* ) rSuff.getValue();
+ const STRING* pSuff = ( const STRING* ) rSuff.getValue();
bi = pSuff->compareToAscii( "i" ) == 0 || pSuff->getLength() == 0;
if( !bi && pSuff->compareToAscii( "j" ) != 0 )
THROW_IAE;