diff options
Diffstat (limited to 'sc/source/core/tool/interpr5.cxx')
-rw-r--r-- | sc/source/core/tool/interpr5.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 049e7a235870..ff728173661b 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.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 @@ -66,35 +66,35 @@ const double fInvEpsilon = 1.0E-7; // ----------------------------------------------------------------------- struct MatrixAdd : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxAdd( lhs,rhs); } }; struct MatrixSub : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxSub( lhs,rhs); } }; struct MatrixMul : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return lhs * rhs; } }; struct MatrixDiv : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ScInterpreter::div( lhs,rhs); } }; struct MatrixPow : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::pow( lhs,rhs); } @@ -309,7 +309,7 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetNewMat" ); ScMatrix* pMat = new ScMatrix( nC, nR); pMat->SetErrorInterpreter( this); - // A temporary matrix is mutable and ScMatrix::CloneIfConst() returns the + // A temporary matrix is mutable and ScMatrix::CloneIfConst() returns the // very matrix. pMat->SetImmutable( false); SCSIZE nCols, nRows; @@ -2061,7 +2061,7 @@ void ScInterpreter::ScRGP() CalulateRGPRKP(FALSE); } bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY) -{ +{ nCX = 0; nCY = 0; nRX = 0; @@ -2191,7 +2191,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP) SCSIZE M = 0, N = 0; if ( !CheckMatrix(_bRKP,FALSE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) ) return; - + ScMatrixRef pResMat; if (nCase == 1) { @@ -2350,7 +2350,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP) } if ( !Calculate4(_bRKP,pResMat,pQ,bConstant,N,M) ) return; - + if (bStats) Calculate(pResMat,pE,pQ,pV,pMatX,bConstant,N,M,nCase); } @@ -2406,7 +2406,7 @@ bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,B { if ( !Calculate3(M,pQ) ) return false; - + } for (SCSIZE i = 0; i < M+1; i++) { @@ -2594,8 +2594,8 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth) SCSIZE M = 0, N = 0; if ( !CheckMatrix(_bGrowth,TRUE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) ) return; - - + + SCSIZE nCXN, nRXN; SCSIZE nCountXN; if (!pMatNewX) |