From 9ceb7f65f7f10ab027f2034bd663a5b410d31659 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 13 Jul 2013 19:50:16 +0200 Subject: fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO Change-Id: I8ab8f69413561c5e5a198bb11f07920720c48d25 Reviewed-on: https://gerrit.libreoffice.org/4886 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- include/sal/log-areas.dox | 1 + sc/source/core/tool/interpr1.cxx | 151 ------------------------------------ sc/source/core/tool/interpr2.cxx | 75 ------------------ sc/source/core/tool/interpr3.cxx | 86 -------------------- sc/source/core/tool/interpr4.cxx | 67 ---------------- sc/source/core/tool/interpr5.cxx | 34 -------- sc/source/core/tool/interpr6.cxx | 12 --- sc/source/filter/excel/xiescher.cxx | 3 - sc/source/filter/xml/xmlwrap.cxx | 37 ++++----- sc/source/ui/app/scdll.cxx | 3 - sc/source/ui/docshell/docsh.cxx | 15 ---- sc/source/ui/docshell/docsh2.cxx | 5 -- sc/source/ui/unoobj/scdetect.cxx | 1 - sc/source/ui/view/tabview.cxx | 3 - sc/source/ui/view/tabvwsh4.cxx | 3 - 15 files changed, 17 insertions(+), 479 deletions(-) diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 19adf5f6b0b2..95ec6f1914c2 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -80,6 +80,7 @@ certain functionality. @li @c sc @li @c sc.core @li @c sc.ui - Calc UI +@li @c sc.filter - Calc filter @section desktop diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 6164e890da97..e01b512aa77b 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "patattr.hxx" @@ -118,7 +117,6 @@ private: void ScInterpreter::ScIfJump() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIfJump" ); const short* pJump = pCur->GetJump(); short nJumpCount = pJump[ 0 ]; MatrixDoubleRefToMatrix(); @@ -270,7 +268,6 @@ static void lcl_storeJumpMatResult( const ScMatrix* pMat, ScMatrix* pResMat, SCS void ScInterpreter::ScIfError( bool bNAonly ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Donkers/erAck", "ScInterpreter::ScIfError" ); const short* pJump = pCur->GetJump(); short nJumpCount = pJump[ 0 ]; if (!sp) @@ -432,7 +429,6 @@ void ScInterpreter::ScIfError( bool bNAonly ) void ScInterpreter::ScChoseJump() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChoseJump" ); // We have to set a jump, if there was none chosen because of an error set // it to endpoint. bool bHaveJump = false; @@ -560,7 +556,6 @@ static void lcl_AdjustJumpMatrix( ScJumpMatrix* pJumpM, ScMatrixRef& pResMat, SC bool ScInterpreter::JumpMatrix( short nStackLevel ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::JumpMatrix" ); pJumpMatrix = static_cast(pStack[sp-nStackLevel])->GetJumpMatrix(); ScMatrixRef pResMat = pJumpMatrix->GetResultMatrix(); SCSIZE nC, nR; @@ -843,7 +838,6 @@ ScCompareOptions::ScCompareOptions( ScDocument* pDoc, const ScQueryEntry& rEntry double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOptions ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CompareFunc" ); // Keep DoubleError if encountered // #i40539# if bEmpty is set, bVal/nVal are uninitialized if ( !rComp.bEmpty[0] && rComp.bVal[0] && !::rtl::math::isFinite( rComp.nVal[0])) @@ -1000,7 +994,6 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp double ScInterpreter::Compare() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Compare" ); String aVal1, aVal2; ScCompare aComp( &aVal1, &aVal2 ); for( short i = 1; i >= 0; i-- ) @@ -1090,7 +1083,6 @@ double ScInterpreter::Compare() ScMatrixRef ScInterpreter::CompareMat( ScCompareOptions* pOptions ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CompareMat" ); String aVal1, aVal2; ScCompare aComp( &aVal1, &aVal2 ); ScMatrixRef pMat[2]; @@ -1275,7 +1267,6 @@ ScMatrixRef ScInterpreter::QueryMat( const ScMatrixRef& pMat, ScCompareOptions& void ScInterpreter::ScEqual() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScEqual" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1294,7 +1285,6 @@ void ScInterpreter::ScEqual() void ScInterpreter::ScNotEqual() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNotEqual" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1313,7 +1303,6 @@ void ScInterpreter::ScNotEqual() void ScInterpreter::ScLess() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLess" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1332,7 +1321,6 @@ void ScInterpreter::ScLess() void ScInterpreter::ScGreater() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGreater" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1351,7 +1339,6 @@ void ScInterpreter::ScGreater() void ScInterpreter::ScLessEqual() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLessEqual" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1370,7 +1357,6 @@ void ScInterpreter::ScLessEqual() void ScInterpreter::ScGreaterEqual() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGreaterEqual" ); if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) { ScMatrixRef pMat = CompareMat(); @@ -1389,7 +1375,6 @@ void ScInterpreter::ScGreaterEqual() void ScInterpreter::ScAnd() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAnd" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nParamCount = GetByte(); if ( MustHaveParamCountMin( nParamCount, 1 ) ) @@ -1490,7 +1475,6 @@ void ScInterpreter::ScAnd() void ScInterpreter::ScOr() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScOr" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nParamCount = GetByte(); if ( MustHaveParamCountMin( nParamCount, 1 ) ) @@ -1592,7 +1576,6 @@ void ScInterpreter::ScOr() void ScInterpreter::ScXor() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScXor" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nParamCount = GetByte(); @@ -1697,7 +1680,6 @@ void ScInterpreter::ScXor() void ScInterpreter::ScNeg() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNeg" ); // Simple negation doesn't change current format type to number, keep // current type. nFuncFmtType = nCurFmtType; @@ -1741,7 +1723,6 @@ void ScInterpreter::ScNeg() void ScInterpreter::ScPercentSign() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPercentSign" ); nFuncFmtType = NUMBERFORMAT_PERCENT; const FormulaToken* pSaveCur = pCur; sal_uInt8 nSavePar = cPar; @@ -1757,7 +1738,6 @@ void ScInterpreter::ScPercentSign() void ScInterpreter::ScNot() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNot" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; switch ( GetStackType() ) { @@ -1799,7 +1779,6 @@ void ScInterpreter::ScNot() void ScInterpreter::ScBitAnd() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pechlaner", "ScInterpreter::ScBitAnd" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1816,7 +1795,6 @@ void ScInterpreter::ScBitAnd() void ScInterpreter::ScBitOr() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pechlaner", "ScInterpreter::ScBitOr" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1833,7 +1811,6 @@ void ScInterpreter::ScBitOr() void ScInterpreter::ScBitXor() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pechlaner", "ScInterpreter::ScBitXor" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1850,7 +1827,6 @@ void ScInterpreter::ScBitXor() void ScInterpreter::ScBitLshift() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pechlaner", "ScInterpreter::ScBitLshift" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1875,7 +1851,6 @@ void ScInterpreter::ScBitLshift() void ScInterpreter::ScBitRshift() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "pechlaner", "ScInterpreter::ScBitRshift" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1900,21 +1875,18 @@ void ScInterpreter::ScBitRshift() void ScInterpreter::ScPi() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPi" ); PushDouble(F_PI); } void ScInterpreter::ScRandom() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRandom" ); PushDouble(sc::rng::uniform()); } void ScInterpreter::ScTrue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrue" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(1); } @@ -1922,7 +1894,6 @@ void ScInterpreter::ScTrue() void ScInterpreter::ScFalse() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFalse" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(0); } @@ -1930,111 +1901,95 @@ void ScInterpreter::ScFalse() void ScInterpreter::ScDeg() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDeg" ); PushDouble((GetDouble() / F_PI) * 180.0); } void ScInterpreter::ScRad() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRad" ); PushDouble(GetDouble() * (F_PI / 180)); } void ScInterpreter::ScSin() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSin" ); PushDouble(::rtl::math::sin(GetDouble())); } void ScInterpreter::ScCos() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCos" ); PushDouble(::rtl::math::cos(GetDouble())); } void ScInterpreter::ScTan() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTan" ); PushDouble(::rtl::math::tan(GetDouble())); } void ScInterpreter::ScCot() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCot" ); PushDouble(1.0 / ::rtl::math::tan(GetDouble())); } void ScInterpreter::ScArcSin() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcSin" ); PushDouble(asin(GetDouble())); } void ScInterpreter::ScArcCos() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcCos" ); PushDouble(acos(GetDouble())); } void ScInterpreter::ScArcTan() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcTan" ); PushDouble(atan(GetDouble())); } void ScInterpreter::ScArcCot() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcCot" ); PushDouble((F_PI2) - atan(GetDouble())); } void ScInterpreter::ScSinHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSinHyp" ); PushDouble(sinh(GetDouble())); } void ScInterpreter::ScCosHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCosHyp" ); PushDouble(cosh(GetDouble())); } void ScInterpreter::ScTanHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTanHyp" ); PushDouble(tanh(GetDouble())); } void ScInterpreter::ScCotHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCotHyp" ); PushDouble(1.0 / tanh(GetDouble())); } void ScInterpreter::ScArcSinHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcSinHyp" ); PushDouble( ::rtl::math::asinh( GetDouble())); } void ScInterpreter::ScArcCosHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcCosHyp" ); double fVal = GetDouble(); if (fVal < 1.0) PushIllegalArgument(); @@ -2044,7 +1999,6 @@ void ScInterpreter::ScArcCosHyp() void ScInterpreter::ScArcTanHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcTanHyp" ); double fVal = GetDouble(); if (fabs(fVal) >= 1.0) PushIllegalArgument(); @@ -2055,7 +2009,6 @@ void ScInterpreter::ScArcTanHyp() void ScInterpreter::ScArcCotHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcCotHyp" ); double nVal = GetDouble(); if (fabs(nVal) <= 1.0) PushIllegalArgument(); @@ -2065,39 +2018,33 @@ void ScInterpreter::ScArcCotHyp() void ScInterpreter::ScCosecant() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "regina", "ScInterpreter::ScCosecant" ); PushDouble(1.0 / ::rtl::math::sin(GetDouble())); } void ScInterpreter::ScSecant() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "regina", "ScInterpreter::ScSecant" ); PushDouble(1.0 / ::rtl::math::cos(GetDouble())); } void ScInterpreter::ScCosecantHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "regina", "ScInterpreter::ScCosecantHyp" ); PushDouble(1.0 / sinh(GetDouble())); } void ScInterpreter::ScSecantHyp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "regina", "ScInterpreter::ScSecantHyp" ); PushDouble(1.0 / cosh(GetDouble())); } void ScInterpreter::ScExp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScExp" ); PushDouble(exp(GetDouble())); } void ScInterpreter::ScSqrt() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSqrt" ); double fVal = GetDouble(); if (fVal >= 0.0) PushDouble(sqrt(fVal)); @@ -2108,7 +2055,6 @@ void ScInterpreter::ScSqrt() void ScInterpreter::ScIsEmpty() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsEmpty" ); short nRes = 0; nFuncFmtType = NUMBERFORMAT_LOGICAL; switch ( GetRawStackType() ) @@ -2165,7 +2111,6 @@ void ScInterpreter::ScIsEmpty() short ScInterpreter::IsString() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsString" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetRawStackType() ) @@ -2227,21 +2172,18 @@ short ScInterpreter::IsString() void ScInterpreter::ScIsString() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsString" ); PushInt( IsString() ); } void ScInterpreter::ScIsNonString() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsNonString" ); PushInt( !IsString() ); } void ScInterpreter::ScIsLogical() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsLogical" ); short nRes = 0; switch ( GetStackType() ) { @@ -2281,7 +2223,6 @@ void ScInterpreter::ScIsLogical() void ScInterpreter::ScType() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScType" ); short nType = 0; switch ( GetStackType() ) { @@ -2754,7 +2695,6 @@ void ScInterpreter::ScCellExternal() void ScInterpreter::ScIsRef() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCell" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetStackType() ) @@ -2792,7 +2732,6 @@ void ScInterpreter::ScIsRef() void ScInterpreter::ScIsValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsValue" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetRawStackType() ) @@ -2857,7 +2796,6 @@ void ScInterpreter::ScIsValue() void ScInterpreter::ScIsFormula() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsFormula" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetStackType() ) @@ -2882,7 +2820,6 @@ void ScInterpreter::ScIsFormula() void ScInterpreter::ScFormula() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFormula" ); OUString aFormula; switch ( GetStackType() ) { @@ -2916,7 +2853,6 @@ void ScInterpreter::ScFormula() void ScInterpreter::ScIsNV() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsNV" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetStackType() ) @@ -2966,7 +2902,6 @@ void ScInterpreter::ScIsNV() void ScInterpreter::ScIsErr() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsErr" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetStackType() ) @@ -3022,7 +2957,6 @@ void ScInterpreter::ScIsErr() void ScInterpreter::ScIsError() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsError" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; switch ( GetStackType() ) @@ -3075,7 +3009,6 @@ void ScInterpreter::ScIsError() short ScInterpreter::IsEven() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsEven" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; short nRes = 0; double fVal = 0.0; @@ -3160,20 +3093,17 @@ short ScInterpreter::IsEven() void ScInterpreter::ScIsEven() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsEven" ); PushInt( IsEven() ); } void ScInterpreter::ScIsOdd() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIsOdd" ); PushInt( !IsEven() ); } void ScInterpreter::ScN() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScN" ); sal_uInt16 nErr = nGlobalError; nGlobalError = 0; // Temporarily override the ConvertStringToValue() error for @@ -3208,7 +3138,6 @@ void ScInterpreter::ScTrim() void ScInterpreter::ScUpper() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrim" ); String aString = ScGlobal::pCharClass->uppercase(GetString()); PushString(aString); } @@ -3216,7 +3145,6 @@ void ScInterpreter::ScUpper() void ScInterpreter::ScPropper() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPropper" ); //2do: what to do with I18N-CJK ?!? String aStr( GetString() ); const xub_StrLen nLen = aStr.Len(); @@ -3248,7 +3176,6 @@ void ScInterpreter::ScPropper() void ScInterpreter::ScLower() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLower" ); String aString = ScGlobal::pCharClass->lowercase(GetString()); PushString(aString); } @@ -3256,7 +3183,6 @@ void ScInterpreter::ScLower() void ScInterpreter::ScLen() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLen" ); String aStr( GetString() ); PushDouble( aStr.Len() ); } @@ -3264,7 +3190,6 @@ void ScInterpreter::ScLen() void ScInterpreter::ScT() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScT" ); switch ( GetStackType() ) { case svDoubleRef : @@ -3333,7 +3258,6 @@ void ScInterpreter::ScT() void ScInterpreter::ScValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScValue" ); OUString aInputString; double fVal; @@ -3411,7 +3335,6 @@ void ScInterpreter::ScValue() // fdo#57180 void ScInterpreter::ScNumberValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNumberValue" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 1, 3 ) ) @@ -3514,7 +3437,6 @@ static inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) void ScInterpreter::ScClean() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScClean" ); String aStr( GetString() ); for ( xub_StrLen i = 0; i < aStr.Len(); i++ ) { @@ -3527,7 +3449,6 @@ void ScInterpreter::ScClean() void ScInterpreter::ScCode() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCode" ); //2do: make it full range unicode? const String& rStr = GetString(); //"classic" ByteString conversion flags @@ -3544,7 +3465,6 @@ void ScInterpreter::ScCode() void ScInterpreter::ScChar() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChar" ); //2do: make it full range unicode? double fVal = GetDouble(); if (fVal < 0.0 || fVal >= 256.0) @@ -3610,7 +3530,6 @@ static OUString lcl_convertIntoFullWidth( const OUString & rStr ) */ void ScInterpreter::ScJis() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScJis" ); if (MustHaveParamCount( GetByte(), 1)) PushString( lcl_convertIntoFullWidth( GetString())); } @@ -3624,14 +3543,12 @@ void ScInterpreter::ScJis() */ void ScInterpreter::ScAsc() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAsc" ); if (MustHaveParamCount( GetByte(), 1)) PushString( lcl_convertIntoHalfWidth( GetString())); } void ScInterpreter::ScUnicode() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScUnicode" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { const OUString& rStr = GetString(); @@ -3647,7 +3564,6 @@ void ScInterpreter::ScUnicode() void ScInterpreter::ScUnichar() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScUnichar" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { double dVal = ::rtl::math::approxFloor( GetDouble() ); @@ -3665,7 +3581,6 @@ void ScInterpreter::ScUnichar() void ScInterpreter::ScMin( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMin" ); short nParamCount = GetByte(); if (!MustHaveParamCountMin( nParamCount, 1)) return; @@ -3757,7 +3672,6 @@ void ScInterpreter::ScMin( bool bTextAsZero ) void ScInterpreter::ScMax( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMax" ); short nParamCount = GetByte(); if (!MustHaveParamCountMin( nParamCount, 1)) return; @@ -3853,7 +3767,6 @@ void ScInterpreter::ScMax( bool bTextAsZero ) void ScInterpreter::GetStVarParams( double& rVal, double& rValCount, bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetStVarParams" ); short nParamCount = GetByte(); std::vector values; @@ -3970,7 +3883,6 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount, void ScInterpreter::ScVar( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVar" ); double nVal; double nValCount; GetStVarParams( nVal, nValCount, bTextAsZero ); @@ -3984,7 +3896,6 @@ void ScInterpreter::ScVar( bool bTextAsZero ) void ScInterpreter::ScVarP( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVarP" ); double nVal; double nValCount; GetStVarParams( nVal, nValCount, bTextAsZero ); @@ -3995,7 +3906,6 @@ void ScInterpreter::ScVarP( bool bTextAsZero ) void ScInterpreter::ScStDev( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStDev" ); double nVal; double nValCount; GetStVarParams( nVal, nValCount, bTextAsZero ); @@ -4008,7 +3918,6 @@ void ScInterpreter::ScStDev( bool bTextAsZero ) void ScInterpreter::ScStDevP( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStDevP" ); double nVal; double nValCount; GetStVarParams( nVal, nValCount, bTextAsZero ); @@ -4038,7 +3947,6 @@ void ScInterpreter::ScStDevP( bool bTextAsZero ) void ScInterpreter::ScColumns() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScColumns" ); sal_uInt8 nParamCount = GetByte(); sal_uLong nVal = 0; SCCOL nCol1; @@ -4096,7 +4004,6 @@ void ScInterpreter::ScColumns() void ScInterpreter::ScRows() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRows" ); sal_uInt8 nParamCount = GetByte(); sal_uLong nVal = 0; SCCOL nCol1; @@ -4153,7 +4060,6 @@ void ScInterpreter::ScRows() void ScInterpreter::ScTables() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTables" ); sal_uInt8 nParamCount = GetByte(); sal_uLong nVal; if ( nParamCount == 0 ) @@ -4208,7 +4114,6 @@ void ScInterpreter::ScTables() void ScInterpreter::ScColumn() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScColumn" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 0, 1 ) ) { @@ -4291,7 +4196,6 @@ void ScInterpreter::ScColumn() void ScInterpreter::ScRow() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRow" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 0, 1 ) ) { @@ -4373,7 +4277,6 @@ void ScInterpreter::ScRow() void ScInterpreter::ScTable() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTable" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 0, 1 ) ) { @@ -4571,7 +4474,6 @@ static void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat, void ScInterpreter::ScMatch() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatch" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) @@ -4887,7 +4789,6 @@ void ScInterpreter::ScMatch() void ScInterpreter::ScCountEmptyCells() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCountEmptyCells" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { sal_uLong nMaxCount = 0, nCount = 0; @@ -5350,19 +5251,16 @@ double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc ) void ScInterpreter::ScSumIf() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumIf" ); PushDouble( IterateParametersIf( ifSUMIF)); } void ScInterpreter::ScAverageIf() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "makkica", "ScInterpreter::ScAverageIf" ); PushDouble( IterateParametersIf( ifAVERAGEIF)); } void ScInterpreter::ScCountIf() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCountIf" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { OUString aString; @@ -5965,25 +5863,21 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs eFunc ) void ScInterpreter::ScSumIfs() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "makkica", "ScInterpreter::ScSumIfs" ); PushDouble( IterateParametersIfs( ifSUMIFS)); } void ScInterpreter::ScAverageIfs() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "makkica", "ScInterpreter::ScAverageIfs" ); PushDouble( IterateParametersIfs( ifAVERAGEIFS)); } void ScInterpreter::ScCountIfs() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "makkica", "ScInterpreter::ScCountIfs" ); PushDouble( IterateParametersIfs( ifCOUNTIFS)); } void ScInterpreter::ScLookup() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLookup" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 2, 3 ) ) return ; @@ -6542,12 +6436,10 @@ void ScInterpreter::ScLookup() void ScInterpreter::ScHLookup() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHLookup" ); CalculateLookup(true); } void ScInterpreter::CalculateLookup(bool HLookup) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateLookup" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 3, 4 ) ) { @@ -6780,7 +6672,6 @@ void ScInterpreter::CalculateLookup(bool HLookup) bool ScInterpreter::FillEntry(ScQueryEntry& rEntry) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::FillEntry" ); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); switch ( GetStackType() ) { @@ -6841,13 +6732,11 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry) } void ScInterpreter::ScVLookup() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVLookup" ); CalculateLookup(false); } void ScInterpreter::ScSubTotal() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubTotal" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCountMin( nParamCount, 2 ) ) { @@ -6897,7 +6786,6 @@ void ScInterpreter::ScSubTotal() ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDBParams" ); bool bAllowMissingField = false; if ( rMissingField ) { @@ -7044,7 +6932,6 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) void ScInterpreter::DBIterator( ScIterFunc eFunc ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DBIterator" ); double nErg = 0.0; double fMem = 0.0; bool bNull = true; @@ -7112,14 +6999,12 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) void ScInterpreter::ScDBSum() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBSum" ); DBIterator( ifSUM ); } void ScInterpreter::ScDBCount() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" ); bool bMissingField = true; SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr pQueryParam( GetDBParams(bMissingField) ); @@ -7181,7 +7066,6 @@ void ScInterpreter::ScDBCount() void ScInterpreter::ScDBCount2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" ); bool bMissingField = true; SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr pQueryParam( GetDBParams(bMissingField) ); @@ -7215,35 +7099,30 @@ void ScInterpreter::ScDBCount2() void ScInterpreter::ScDBAverage() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBAverage" ); DBIterator( ifAVERAGE ); } void ScInterpreter::ScDBMax() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBMax" ); DBIterator( ifMAX ); } void ScInterpreter::ScDBMin() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBMin" ); DBIterator( ifMIN ); } void ScInterpreter::ScDBProduct() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBProduct" ); DBIterator( ifPRODUCT ); } void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDBStVarParams" ); std::vector values; double vSum = 0.0; double vMean = 0.0; @@ -7289,7 +7168,6 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) void ScInterpreter::ScDBStdDev() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBStdDev" ); double fVal, fCount; GetDBStVarParams( fVal, fCount ); PushDouble( sqrt(fVal/(fCount-1))); @@ -7298,7 +7176,6 @@ void ScInterpreter::ScDBStdDev() void ScInterpreter::ScDBStdDevP() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBStdDevP" ); double fVal, fCount; GetDBStVarParams( fVal, fCount ); PushDouble( sqrt(fVal/fCount)); @@ -7307,7 +7184,6 @@ void ScInterpreter::ScDBStdDevP() void ScInterpreter::ScDBVar() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBVar" ); double fVal, fCount; GetDBStVarParams( fVal, fCount ); PushDouble(fVal/(fCount-1)); @@ -7316,7 +7192,6 @@ void ScInterpreter::ScDBVar() void ScInterpreter::ScDBVarP() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBVarP" ); double fVal, fCount; GetDBStVarParams( fVal, fCount ); PushDouble(fVal/fCount); @@ -7324,7 +7199,6 @@ void ScInterpreter::ScDBVarP() void ScInterpreter::ScIndirect() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIndirect" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -7406,7 +7280,6 @@ void ScInterpreter::ScIndirect() void ScInterpreter::ScAddressFunc() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAddressFunc" ); String sTabStr; sal_uInt8 nParamCount = GetByte(); @@ -7499,7 +7372,6 @@ void ScInterpreter::ScAddressFunc() void ScInterpreter::ScOffset() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScOffset" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 3, 5 ) ) { @@ -7647,7 +7519,6 @@ void ScInterpreter::ScOffset() void ScInterpreter::ScIndex() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIndex" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 4 ) ) { @@ -7855,7 +7726,6 @@ void ScInterpreter::ScIndex() void ScInterpreter::ScMultiArea() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMultiArea" ); // Legacy support, convert to RefList sal_uInt8 nParamCount = GetByte(); if (MustHaveParamCountMin( nParamCount, 1)) @@ -7870,7 +7740,6 @@ void ScInterpreter::ScMultiArea() void ScInterpreter::ScAreas() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAreas" ); sal_uInt8 nParamCount = GetByte(); if (MustHaveParamCount( nParamCount, 1)) { @@ -7908,7 +7777,6 @@ void ScInterpreter::ScAreas() void ScInterpreter::ScCurrency() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCurrency" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -7968,7 +7836,6 @@ void ScInterpreter::ScCurrency() void ScInterpreter::ScReplace() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScReplace" ); if ( MustHaveParamCount( GetByte(), 4 ) ) { String aNewStr( GetString() ); @@ -7998,7 +7865,6 @@ void ScInterpreter::ScReplace() void ScInterpreter::ScFixed() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFixed" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 3 ) ) { @@ -8057,7 +7923,6 @@ void ScInterpreter::ScFixed() void ScInterpreter::ScFind() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFind" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) { @@ -8083,7 +7948,6 @@ void ScInterpreter::ScFind() void ScInterpreter::ScExact() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScExact" ); nFuncFmtType = NUMBERFORMAT_LOGICAL; if ( MustHaveParamCount( GetByte(), 2 ) ) { @@ -8096,7 +7960,6 @@ void ScInterpreter::ScExact() void ScInterpreter::ScLeft() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLeft" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -8172,7 +8035,6 @@ sal_Int32 getLengthB(String &str) } void ScInterpreter::ScLenB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "luzhang", "ScInterpreter::ScLenB" ); String aStr( GetString() ); PushDouble( getLengthB(aStr) ); } @@ -8203,7 +8065,6 @@ void lcl_RightB(String &aStr, sal_Int32 n) } void ScInterpreter::ScRightB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "luzhang", "ScInterpreter::ScRightB" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -8253,7 +8114,6 @@ void lcl_LeftB(String &aStr, sal_Int32 n) } void ScInterpreter::ScLeftB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "luzhang", "ScInterpreter::ScLeftB" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -8278,7 +8138,6 @@ void ScInterpreter::ScLeftB() } void ScInterpreter::ScMidB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "luzhang", "ScInterpreter::ScMidB" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double fAnz = ::rtl::math::approxFloor(GetDouble()); @@ -8299,7 +8158,6 @@ void ScInterpreter::ScMidB() void ScInterpreter::ScRight() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRight" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -8327,7 +8185,6 @@ void ScInterpreter::ScRight() void ScInterpreter::ScSearch() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSearch" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) { @@ -8368,7 +8225,6 @@ void ScInterpreter::ScSearch() void ScInterpreter::ScMid() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMid" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double fAnz = ::rtl::math::approxFloor(GetDouble()); @@ -8384,7 +8240,6 @@ void ScInterpreter::ScMid() void ScInterpreter::ScText() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScText" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { OUString sFormatString = GetString(); @@ -8459,7 +8314,6 @@ void ScInterpreter::ScText() void ScInterpreter::ScSubstitute() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubstitute" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 3, 4 ) ) { @@ -8514,7 +8368,6 @@ void ScInterpreter::ScSubstitute() void ScInterpreter::ScRept() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRept" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double fAnz = ::rtl::math::approxFloor(GetDouble()); @@ -8542,7 +8395,6 @@ void ScInterpreter::ScRept() void ScInterpreter::ScConcat() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScConcat" ); sal_uInt8 nParamCount = GetByte(); String aRes; while( nParamCount-- > 0) @@ -8556,7 +8408,6 @@ void ScInterpreter::ScConcat() void ScInterpreter::ScErrorType() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrorType" ); sal_uInt16 nErr; sal_uInt16 nOldError = nGlobalError; nGlobalError = 0; @@ -8638,7 +8489,6 @@ void ScInterpreter::ScErrorType() bool ScInterpreter::MayBeRegExp( const OUString& rStr, const ScDocument* pDoc ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::MayBeRegExp" ); if ( pDoc && !pDoc->GetDocOptions().IsFormulaRegexEnabled() ) return false; if ( rStr.isEmpty() || (rStr.getLength() == 1 && rStr[0] != '.') ) @@ -8688,7 +8538,6 @@ static bool lcl_LookupQuery( ScAddress & o_rResultPos, ScDocument * pDoc, bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos, const ScQueryParam & rParam ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::LookupQueryWithCache" ); bool bFound = false; const ScQueryEntry& rEntry = rParam.GetEntry(0); bool bColumnsMatch = (rParam.nCol1 == rEntry.nField); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index a53c6da5512c..0fcb564ba92d 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include "attrib.hxx" @@ -63,7 +62,6 @@ using namespace formula; double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict, bool bCheckGregorian ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDateSerial" ); if ( nYear < 100 && !bStrict ) nYear = pFormatter->ExpandTwoDigitYear( nYear ); // Do not use a default Date ctor here because it asks system time with a @@ -103,7 +101,6 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1 void ScInterpreter::ScGetActDate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetActDate" ); nFuncFmtType = NUMBERFORMAT_DATE; Date aActDate( Date::SYSTEM ); long nDiff = aActDate - *(pFormatter->GetNullDate()); @@ -112,7 +109,6 @@ void ScInterpreter::ScGetActDate() void ScInterpreter::ScGetActTime() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetActTime" ); nFuncFmtType = NUMBERFORMAT_DATETIME; Date aActDate( Date::SYSTEM ); long nDiff = aActDate - *(pFormatter->GetNullDate()); @@ -126,7 +122,6 @@ void ScInterpreter::ScGetActTime() void ScInterpreter::ScGetYear() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetYear" ); Date aDate = *(pFormatter->GetNullDate()); aDate += (long) ::rtl::math::approxFloor(GetDouble()); PushDouble( (double) aDate.GetYear() ); @@ -134,7 +129,6 @@ void ScInterpreter::ScGetYear() void ScInterpreter::ScGetMonth() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetMonth" ); Date aDate = *(pFormatter->GetNullDate()); aDate += (long) ::rtl::math::approxFloor(GetDouble()); PushDouble( (double) aDate.GetMonth() ); @@ -142,7 +136,6 @@ void ScInterpreter::ScGetMonth() void ScInterpreter::ScGetDay() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDay" ); Date aDate = *(pFormatter->GetNullDate()); aDate += (long)::rtl::math::approxFloor(GetDouble()); PushDouble((double) aDate.GetDay()); @@ -150,7 +143,6 @@ void ScInterpreter::ScGetDay() void ScInterpreter::ScGetMin() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetMin" ); double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::Time::secondPerHour; @@ -159,7 +151,6 @@ void ScInterpreter::ScGetMin() void ScInterpreter::ScGetSec() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetSec" ); double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::Time::secondPerMinute; @@ -168,7 +159,6 @@ void ScInterpreter::ScGetSec() void ScInterpreter::ScGetHour() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetHour" ); double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) / ::Time::secondPerHour; @@ -177,7 +167,6 @@ void ScInterpreter::ScGetHour() void ScInterpreter::ScGetDateValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDateValue" ); String aInputString = GetString(); sal_uInt32 nFIndex = 0; // damit default Land/Spr. double fVal; @@ -195,7 +184,6 @@ void ScInterpreter::ScGetDateValue() void ScInterpreter::ScGetDayOfWeek() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDayOfWeek" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -223,7 +211,6 @@ void ScInterpreter::ScGetDayOfWeek() void ScInterpreter::ScGetWeekOfYear() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetWeekOfYear" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { short nFlag = (short) ::rtl::math::approxFloor(GetDouble()); @@ -236,7 +223,6 @@ void ScInterpreter::ScGetWeekOfYear() void ScInterpreter::ScEasterSunday() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScEasterSunday" ); nFuncFmtType = NUMBERFORMAT_DATE; if ( MustHaveParamCount( GetByte(), 1 ) ) { @@ -267,7 +253,6 @@ void ScInterpreter::ScEasterSunday() void ScInterpreter::ScGetDate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDate" ); nFuncFmtType = NUMBERFORMAT_DATE; if ( MustHaveParamCount( GetByte(), 3 ) ) { @@ -285,7 +270,6 @@ void ScInterpreter::ScGetDate() void ScInterpreter::ScGetTime() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetTime" ); nFuncFmtType = NUMBERFORMAT_TIME; if ( MustHaveParamCount( GetByte(), 3 ) ) { @@ -302,7 +286,6 @@ void ScInterpreter::ScGetTime() void ScInterpreter::ScGetDiffDate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDiffDate" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double nDate2 = GetDouble(); @@ -313,7 +296,6 @@ void ScInterpreter::ScGetDiffDate() void ScInterpreter::ScGetDiffDate360() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDiffDate360" ); /* Implementation follows * http://www.bondmarkets.com/eCommerce/SMD_Fields_030802.pdf * Appendix B: Day-Count Bases, there are 7 different ways to calculate the @@ -409,7 +391,6 @@ void ScInterpreter::ScGetDiffDate360() // fdo#44456 function DATEDIF as defined in ODF1.2 (Par. 6.10.3) void ScInterpreter::ScGetDateDif() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDateDif" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { String aInterval = GetString(); @@ -555,7 +536,6 @@ void ScInterpreter::ScGetDateDif() void ScInterpreter::ScGetTimeValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetTimeValue" ); String aInputString = GetString(); sal_uInt32 nFIndex = 0; // damit default Land/Spr. double fVal; @@ -577,7 +557,6 @@ void ScInterpreter::ScGetTimeValue() void ScInterpreter::ScPlusMinus() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPlusMinus" ); double nVal = GetDouble(); short n = 0; if (nVal < 0.0) @@ -589,20 +568,17 @@ void ScInterpreter::ScPlusMinus() void ScInterpreter::ScAbs() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAbs" ); PushDouble(fabs(GetDouble())); } void ScInterpreter::ScInt() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScInt" ); PushDouble(::rtl::math::approxFloor(GetDouble())); } void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::RoundNumber" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -623,25 +599,21 @@ void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode ) void ScInterpreter::ScRound() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRound" ); RoundNumber( rtl_math_RoundingMode_Corrected ); } void ScInterpreter::ScRoundDown() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRoundDown" ); RoundNumber( rtl_math_RoundingMode_Down ); } void ScInterpreter::ScRoundUp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRoundUp" ); RoundNumber( rtl_math_RoundingMode_Up ); } void ScInterpreter::ScCeil() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCeil" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) { @@ -664,7 +636,6 @@ void ScInterpreter::ScCeil() void ScInterpreter::ScFloor() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFloor" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) { @@ -687,7 +658,6 @@ void ScInterpreter::ScFloor() void ScInterpreter::ScEven() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScEven" ); double fVal = GetDouble(); if (fVal < 0.0) PushDouble(::rtl::math::approxFloor(fVal/2.0) * 2.0); @@ -697,7 +667,6 @@ void ScInterpreter::ScEven() void ScInterpreter::ScOdd() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScOdd" ); double fVal = GetDouble(); if (fVal >= 0.0) { @@ -716,7 +685,6 @@ void ScInterpreter::ScOdd() void ScInterpreter::ScArcTan2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcTan2" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double nVal2 = GetDouble(); @@ -727,7 +695,6 @@ void ScInterpreter::ScArcTan2() void ScInterpreter::ScLog() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLog" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -746,7 +713,6 @@ void ScInterpreter::ScLog() void ScInterpreter::ScLn() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLn" ); double fVal = GetDouble(); if (fVal > 0.0) PushDouble(log(fVal)); @@ -756,7 +722,6 @@ void ScInterpreter::ScLn() void ScInterpreter::ScLog10() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLog10" ); double fVal = GetDouble(); if (fVal > 0.0) PushDouble(log10(fVal)); @@ -766,7 +731,6 @@ void ScInterpreter::ScLog10() void ScInterpreter::ScNPV() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNPV" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; short nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 31 ) ) @@ -834,7 +798,6 @@ void ScInterpreter::ScNPV() void ScInterpreter::ScIRR() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIRR" ); double fSchaetzwert; nFuncFmtType = NUMBERFORMAT_PERCENT; sal_uInt8 nParamCount = GetByte(); @@ -972,7 +935,6 @@ void ScInterpreter::ScISPMT() double ScInterpreter::ScGetBw(double fZins, double fZzr, double fRmz, double fZw, double fF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMIRR" ); double fBw; if (fZins == 0.0) fBw = fZw + fRmz * fZzr; @@ -988,7 +950,6 @@ double ScInterpreter::ScGetBw(double fZins, double fZzr, double fRmz, void ScInterpreter::ScBW() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBW" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; double nRmz, nZzr, nZins, nZw = 0, nFlag = 0; sal_uInt8 nParamCount = GetByte(); @@ -1006,7 +967,6 @@ void ScInterpreter::ScBW() void ScInterpreter::ScDIA() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDIA" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 4 ) ) { @@ -1023,7 +983,6 @@ void ScInterpreter::ScDIA() double ScInterpreter::ScGetGDA(double fWert, double fRest, double fDauer, double fPeriode, double fFaktor) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetGDA" ); double fGda, fZins, fAlterWert, fNeuerWert; fZins = fFaktor / fDauer; if (fZins >= 1.0) @@ -1049,7 +1008,6 @@ double ScInterpreter::ScGetGDA(double fWert, double fRest, double fDauer, void ScInterpreter::ScGDA() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGDA" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 4, 5 ) ) @@ -1073,7 +1031,6 @@ void ScInterpreter::ScGDA() void ScInterpreter::ScGDA2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGDA2" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 4, 5 ) ) @@ -1120,7 +1077,6 @@ void ScInterpreter::ScGDA2() double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer, double fDauer1,double fPeriode,double fFaktor) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScInterVDB" ); double fVdb=0; double fIntEnd = ::rtl::math::approxCeil(fPeriode); sal_uLong nLoopEnd = (sal_uLong) fIntEnd; @@ -1171,7 +1127,6 @@ inline double DblMin( double a, double b ) void ScInterpreter::ScVDB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVDB" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 5, 7 ) ) @@ -1247,7 +1202,6 @@ void ScInterpreter::ScVDB() void ScInterpreter::ScLaufz() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLaufz" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double nZukunft = GetDouble(); @@ -1259,7 +1213,6 @@ void ScInterpreter::ScLaufz() void ScInterpreter::ScLIA() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLIA" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 3 ) ) { @@ -1273,7 +1226,6 @@ void ScInterpreter::ScLIA() double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv, double fFv, double fPaytype) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetRmz" ); double fPayment; if (fRate == 0.0) fPayment = (fPv + fFv) / fNper; @@ -1291,7 +1243,6 @@ double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv, void ScInterpreter::ScRMZ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRMZ" ); double nZins, nZzr, nBw, nZw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); @@ -1309,7 +1260,6 @@ void ScInterpreter::ScRMZ() void ScInterpreter::ScZGZ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZGZ" ); nFuncFmtType = NUMBERFORMAT_PERCENT; if ( MustHaveParamCount( GetByte(), 3 ) ) { @@ -1323,7 +1273,6 @@ void ScInterpreter::ScZGZ() double ScInterpreter::ScGetZw(double fZins, double fZzr, double fRmz, double fBw, double fF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetZw" ); double fZw; if (fZins == 0.0) fZw = fBw + fRmz * fZzr; @@ -1340,7 +1289,6 @@ double ScInterpreter::ScGetZw(double fZins, double fZzr, double fRmz, void ScInterpreter::ScZW() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZW" ); double nZins, nZzr, nRmz, nBw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); @@ -1358,7 +1306,6 @@ void ScInterpreter::ScZW() void ScInterpreter::ScZZR() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZZR" ); double nZins, nRmz, nBw, nZw = 0, nFlag = 0; sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 5 ) ) @@ -1382,7 +1329,6 @@ void ScInterpreter::ScZZR() bool ScInterpreter::RateIteration( double fNper, double fPayment, double fPv, double fFv, double fPayType, double & fGuess ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::RateIteration" ); // See also #i15090# // Newton-Raphson method: x(i+1) = x(i) - f(x(i)) / f'(x(i)) // This solution handles integer and non-integer values of Nper different. @@ -1479,7 +1425,6 @@ bool ScInterpreter::RateIteration( double fNper, double fPayment, double fPv, // In Calc UI it is the function RATE(Nper;Pmt;Pv;Fv;Type;Guess) void ScInterpreter::ScZins() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZins" ); double fPv, fPayment, fNper; // defaults for missing arguments, see ODFF spec double fFv = 0, fPayType = 0, fGuess = 0.1, fOrigGuess = 0.1; @@ -1544,7 +1489,6 @@ void ScInterpreter::ScZins() double ScInterpreter::ScGetZinsZ(double fZins, double fZr, double fZzr, double fBw, double fZw, double fF, double& fRmz) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetZinsZ" ); fRmz = ScGetRmz(fZins, fZzr, fBw, fZw, fF); // fuer kapz auch bei fZr == 1 double fZinsZ; nFuncFmtType = NUMBERFORMAT_CURRENCY; @@ -1567,7 +1511,6 @@ double ScInterpreter::ScGetZinsZ(double fZins, double fZr, double fZzr, double f void ScInterpreter::ScZinsZ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZinsZ" ); double nZins, nZr, nZzr, nBw, nZw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); @@ -1592,7 +1535,6 @@ void ScInterpreter::ScZinsZ() void ScInterpreter::ScKapz() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKapz" ); double nZins, nZr, nZzr, nBw, nZw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); @@ -1618,7 +1560,6 @@ void ScInterpreter::ScKapz() void ScInterpreter::ScKumZinsZ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKumZinsZ" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 6 ) ) { @@ -1659,7 +1600,6 @@ void ScInterpreter::ScKumZinsZ() void ScInterpreter::ScKumKapZ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKumKapZ" ); nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 6 ) ) { @@ -1701,7 +1641,6 @@ void ScInterpreter::ScKumKapZ() void ScInterpreter::ScEffektiv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScEffektiv" ); nFuncFmtType = NUMBERFORMAT_PERCENT; if ( MustHaveParamCount( GetByte(), 2 ) ) { @@ -1719,7 +1658,6 @@ void ScInterpreter::ScEffektiv() void ScInterpreter::ScNominal() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNominal" ); nFuncFmtType = NUMBERFORMAT_PERCENT; if ( MustHaveParamCount( GetByte(), 2 ) ) { @@ -1737,7 +1675,6 @@ void ScInterpreter::ScNominal() void ScInterpreter::ScMod() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMod" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double fVal2 = GetDouble(); // Denominator @@ -1775,7 +1712,6 @@ void ScInterpreter::ScMod() */ void ScInterpreter::ScBackSolver() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBackSolver" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { bool bDoneIteration = false; @@ -1959,7 +1895,6 @@ void ScInterpreter::ScBackSolver() void ScInterpreter::ScIntersect() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIntersect" ); formula::FormulaTokenRef p2nd = PopToken(); formula::FormulaTokenRef p1st = PopToken(); @@ -2107,7 +2042,6 @@ void ScInterpreter::ScIntersect() void ScInterpreter::ScRangeFunc() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRangeFunc" ); formula::FormulaTokenRef x2 = PopToken(); formula::FormulaTokenRef x1 = PopToken(); @@ -2126,7 +2060,6 @@ void ScInterpreter::ScRangeFunc() void ScInterpreter::ScUnionFunc() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScUnionFunc" ); formula::FormulaTokenRef p2nd = PopToken(); formula::FormulaTokenRef p1st = PopToken(); @@ -2204,7 +2137,6 @@ void ScInterpreter::ScUnionFunc() void ScInterpreter::ScCurrent() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCurrent" ); FormulaTokenRef xTok( PopToken()); if (xTok) { @@ -2217,7 +2149,6 @@ void ScInterpreter::ScCurrent() void ScInterpreter::ScStyle() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStyle" ); sal_uInt8 nParamCount = GetByte(); if (nParamCount >= 1 && nParamCount <= 3) { @@ -2278,7 +2209,6 @@ static ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr, void ScInterpreter::ScDde() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDde" ); // Applikation, Datei, Bereich // Application, Topic, Item @@ -2659,7 +2589,6 @@ void ScInterpreter::ScRoman() static bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rbIsDec ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBase" ); switch( cChar ) { case 'M': rnValue = 1000; rbIsDec = true; break; @@ -2677,7 +2606,6 @@ static bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rb void ScInterpreter::ScArabic() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArabic" ); String aRoman( GetString() ); if( nGlobalError ) PushError( nGlobalError); @@ -2736,7 +2664,6 @@ void ScInterpreter::ScArabic() void ScInterpreter::ScHyperLink() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHyperLink" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { @@ -3040,7 +2967,6 @@ void lclAppendBlock( OStringBuffer& rText, sal_Int32 nValue ) void ScInterpreter::ScBahtText() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBahtText" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1 ) ) { @@ -3112,7 +3038,6 @@ void ScInterpreter::ScBahtText() void ScInterpreter::ScGetPivotData() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetPivotData" ); sal_uInt8 nParamCount = GetByte(); if (!MustHaveParamCount(nParamCount, 2, 30) || (nParamCount % 2) == 1) diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 9fa7763ea00d..abb7222c37c6 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include "interpre.hxx" #include "global.hxx" @@ -171,13 +170,11 @@ static double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, doubl void ScInterpreter::ScNoName() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNoName" ); PushError(errNoName); } void ScInterpreter::ScBadName() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBadName" ); short nParamCount = GetByte(); while (nParamCount-- > 0) { @@ -188,7 +185,6 @@ void ScInterpreter::ScBadName() double ScInterpreter::phi(double x) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::phi" ); return 0.39894228040143268 * exp(-(x * x) / 2.0); } @@ -199,7 +195,6 @@ double ScInterpreter::integralPhi(double x) double ScInterpreter::taylor(double* pPolynom, sal_uInt16 nMax, double x) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::taylor" ); double nVal = pPolynom[nMax]; for (short i = nMax-1; i >= 0; i--) { @@ -210,7 +205,6 @@ double ScInterpreter::taylor(double* pPolynom, sal_uInt16 nMax, double x) double ScInterpreter::gauss(double x) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::gauss" ); double xAbs = fabs(x); sal_uInt16 xShort = (sal_uInt16)::rtl::math::approxFloor(xAbs); @@ -266,7 +260,6 @@ double ScInterpreter::gauss(double x) double ScInterpreter::gaussinv(double x) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::gaussinv" ); double q,t,z; q=x-0.5; @@ -438,7 +431,6 @@ double ScInterpreter::gaussinv(double x) double ScInterpreter::Fakultaet(double x) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Fakultaet" ); x = ::rtl::math::approxFloor(x); if (x < 0.0) return 0.0; @@ -463,7 +455,6 @@ double ScInterpreter::BinomKoeff(double n, double k) // this method has been duplicated as BinomialCoefficient() // in scaddins/source/analysis/analysishelper.cxx - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::BinomKoeff" ); double nVal = 0.0; k = ::rtl::math::approxFloor(k); if (n < k) @@ -586,7 +577,6 @@ static double lcl_GetLogGammaHelper(double fZ) /** You must ensure non integer arguments for fZ<1 */ double ScInterpreter::GetGamma(double fZ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetGamma" ); const double fLogPi = log(F_PI); const double fLogDblMax = log( ::std::numeric_limits::max()); @@ -631,7 +621,6 @@ double ScInterpreter::GetGamma(double fZ) /** You must ensure fZ>0 */ double ScInterpreter::GetLogGamma(double fZ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetLogGamma" ); if (fZ >= fMaxGammaArgument) return lcl_GetLogGammaHelper(fZ); if (fZ >= 1.0) @@ -643,7 +632,6 @@ double ScInterpreter::GetLogGamma(double fZ) double ScInterpreter::GetFDist(double x, double fF1, double fF2) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetFDist" ); double arg = fF2/(fF2+fF1*x); double alpha = fF2/2.0; double beta = fF1/2.0; @@ -652,7 +640,6 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2) double ScInterpreter::GetTDist(double T, double fDF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetTDist" ); return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5); } @@ -660,7 +647,6 @@ double ScInterpreter::GetTDist(double T, double fDF) /** You must ensure fDF>0.0 */ double ScInterpreter::GetChiDist(double fX, double fDF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetChiDist" ); if (fX <= 0.0) return 1.0; // see ODFF else @@ -673,7 +659,6 @@ double ScInterpreter::GetChiDist(double fX, double fDF) /** You must ensure fDF>0.0 */ double ScInterpreter::GetChiSqDistCDF(double fX, double fDF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetChiSqDistCDF" ); if (fX <= 0.0) return 0.0; // see ODFF else @@ -743,7 +728,6 @@ void ScInterpreter::ScChiSqDist() void ScInterpreter::ScGamma() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGamma" ); double x = GetDouble(); if (x <= 0.0 && x == ::rtl::math::approxFloor(x)) PushIllegalArgument(); @@ -761,7 +745,6 @@ void ScInterpreter::ScGamma() void ScInterpreter::ScLogGamma() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogGamma" ); double x = GetDouble(); if (x > 0.0) // constraint from ODFF PushDouble( GetLogGamma(x)); @@ -1065,19 +1048,16 @@ void ScInterpreter::ScBetaDist() void ScInterpreter::ScPhi() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPhi" ); PushDouble(phi(GetDouble())); } void ScInterpreter::ScGauss() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGauss" ); PushDouble(gauss(GetDouble())); } void ScInterpreter::ScFisher() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFisher" ); double fVal = GetDouble(); if (fabs(fVal) >= 1.0) PushIllegalArgument(); @@ -1087,13 +1067,11 @@ void ScInterpreter::ScFisher() void ScInterpreter::ScFisherInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFisherInv" ); PushDouble( tanh( GetDouble())); } void ScInterpreter::ScFact() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFact" ); double nVal = GetDouble(); if (nVal < 0.0) PushIllegalArgument(); @@ -1103,7 +1081,6 @@ void ScInterpreter::ScFact() void ScInterpreter::ScKombin() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKombin" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double k = ::rtl::math::approxFloor(GetDouble()); @@ -1117,7 +1094,6 @@ void ScInterpreter::ScKombin() void ScInterpreter::ScKombin2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKombin2" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double k = ::rtl::math::approxFloor(GetDouble()); @@ -1131,7 +1107,6 @@ void ScInterpreter::ScKombin2() void ScInterpreter::ScVariationen() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVariationen" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double k = ::rtl::math::approxFloor(GetDouble()); @@ -1152,7 +1127,6 @@ void ScInterpreter::ScVariationen() void ScInterpreter::ScVariationen2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVariationen2" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { double k = ::rtl::math::approxFloor(GetDouble()); @@ -1215,7 +1189,6 @@ double lcl_GetBinomDistRange(double n, double xs,double xe, void ScInterpreter::ScB() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScB" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 4 ) ) return ; @@ -1283,7 +1256,6 @@ void ScInterpreter::ScB() void ScInterpreter::ScBinomDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBinomDist" ); if ( MustHaveParamCount( GetByte(), 4 ) ) { bool bIsCum = GetBool(); // false=mass function; true=cumulative @@ -1348,7 +1320,6 @@ void ScInterpreter::ScBinomDist() void ScInterpreter::ScCritBinom() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCritBinom" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double alpha = GetDouble(); @@ -1394,7 +1365,6 @@ void ScInterpreter::ScCritBinom() void ScInterpreter::ScNegBinomDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNegBinomDist" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double p = GetDouble(); // p @@ -1415,7 +1385,6 @@ void ScInterpreter::ScNegBinomDist() void ScInterpreter::ScNormDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNormDist" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 4)) return; @@ -1436,7 +1405,6 @@ void ScInterpreter::ScNormDist() void ScInterpreter::ScLogNormDist() //expanded, see #i100119# { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 1, 4)) return; @@ -1467,13 +1435,11 @@ void ScInterpreter::ScLogNormDist() //expanded, see #i100119# void ScInterpreter::ScStdNormDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStdNormDist" ); PushDouble(integralPhi(GetDouble())); } void ScInterpreter::ScExpDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScExpDist" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double kum = GetDouble(); // 0 oder 1 @@ -1500,7 +1466,6 @@ void ScInterpreter::ScExpDist() void ScInterpreter::ScTDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTDist" ); if ( !MustHaveParamCount( GetByte(), 3 ) ) return; double fFlag = ::rtl::math::approxFloor(GetDouble()); @@ -1520,7 +1485,6 @@ void ScInterpreter::ScTDist() void ScInterpreter::ScFDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFDist" ); if ( !MustHaveParamCount( GetByte(), 3 ) ) return; double fF2 = ::rtl::math::approxFloor(GetDouble()); @@ -1536,7 +1500,6 @@ void ScInterpreter::ScFDist() void ScInterpreter::ScChiDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChiDist" ); double fResult; if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1558,7 +1521,6 @@ void ScInterpreter::ScChiDist() void ScInterpreter::ScWeibull() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScWeibull" ); if ( MustHaveParamCount( GetByte(), 4 ) ) { double kum = GetDouble(); // 0 oder 1 @@ -1577,7 +1539,6 @@ void ScInterpreter::ScWeibull() void ScInterpreter::ScPoissonDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPoissonDist" ); sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 2, 3 ) ) { @@ -1664,7 +1625,6 @@ static void lcl_PutFactorialElements( ::std::vector< double >& cn, double fLower */ void ScInterpreter::ScHypGeomDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHypGeomDist" ); const size_t nMaxArraySize = 500000; // arbitrary max array size if ( !MustHaveParamCount( GetByte(), 4 ) ) @@ -1878,7 +1838,6 @@ void ScInterpreter::ScHypGeomDist() void ScInterpreter::ScGammaDist() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGammaDist" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 4 ) ) return; @@ -1903,7 +1862,6 @@ void ScInterpreter::ScGammaDist() void ScInterpreter::ScNormInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNormInv" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double sigma = GetDouble(); @@ -1920,7 +1878,6 @@ void ScInterpreter::ScNormInv() void ScInterpreter::ScSNormInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSNormInv" ); double x = GetDouble(); if (x < 0.0 || x > 1.0) PushIllegalArgument(); @@ -1932,7 +1889,6 @@ void ScInterpreter::ScSNormInv() void ScInterpreter::ScLogNormInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormInv" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double sigma = GetDouble(); // Stdabw @@ -1961,7 +1917,6 @@ public: void ScInterpreter::ScGammaInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGammaInv" ); if ( !MustHaveParamCount( GetByte(), 3 ) ) return; double fBeta = GetDouble(); @@ -2002,7 +1957,6 @@ public: void ScInterpreter::ScBetaInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBetaInv" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 5 ) ) return; @@ -2058,7 +2012,6 @@ public: void ScInterpreter::ScTInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTInv" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double fDF = ::rtl::math::approxFloor(GetDouble()); @@ -2093,7 +2046,6 @@ public: void ScInterpreter::ScFInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFInv" ); if ( !MustHaveParamCount( GetByte(), 3 ) ) return; double fF2 = ::rtl::math::approxFloor(GetDouble()); @@ -2129,7 +2081,6 @@ public: void ScInterpreter::ScChiInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChiInv" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double fDF = ::rtl::math::approxFloor(GetDouble()); @@ -2185,7 +2136,6 @@ void ScInterpreter::ScChiSqInv() void ScInterpreter::ScConfidence() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScConfidence" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double n = ::rtl::math::approxFloor(GetDouble()); @@ -2200,7 +2150,6 @@ void ScInterpreter::ScConfidence() void ScInterpreter::ScZTest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZTest" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 2, 3 ) ) return; @@ -2325,7 +2274,6 @@ bool ScInterpreter::CalculateTest(bool _bTemplin ,const ScMatrixRef& pMat1,const ScMatrixRef& pMat2 ,double& fT,double& fF) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateTest" ); double fCount1 = 0.0; double fCount2 = 0.0; double fSum1 = 0.0; @@ -2390,7 +2338,6 @@ bool ScInterpreter::CalculateTest(bool _bTemplin } void ScInterpreter::ScTTest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTest" ); if ( !MustHaveParamCount( GetByte(), 4 ) ) return; double fTyp = ::rtl::math::approxFloor(GetDouble()); @@ -2470,7 +2417,6 @@ void ScInterpreter::ScTTest() void ScInterpreter::ScFTest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFTest" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; ScMatrixRef pMat2 = GetMatrix(); @@ -2544,7 +2490,6 @@ void ScInterpreter::ScFTest() void ScInterpreter::ScChiTest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScChiTest" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; ScMatrixRef pMat2 = GetMatrix(); @@ -2598,7 +2543,6 @@ void ScInterpreter::ScChiTest() void ScInterpreter::ScKurt() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKurt" ); double fSum,fCount,vSum; std::vector values; if ( !CalculateSkew(fSum,fCount,vSum,values) ) @@ -2640,7 +2584,6 @@ void ScInterpreter::ScKurt() void ScInterpreter::ScHarMean() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHarMean" ); short nParamCount = GetByte(); double nVal = 0.0; double nValCount = 0.0; @@ -2763,7 +2706,6 @@ void ScInterpreter::ScHarMean() void ScInterpreter::ScGeoMean() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGeoMean" ); short nParamCount = GetByte(); double nVal = 0.0; double nValCount = 0.0; @@ -2887,7 +2829,6 @@ void ScInterpreter::ScGeoMean() void ScInterpreter::ScStandard() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStandard" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { double sigma = GetDouble(); @@ -2903,7 +2844,6 @@ void ScInterpreter::ScStandard() } bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::vector& values) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSkew" ); short nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return false; @@ -3012,7 +2952,6 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std:: void ScInterpreter::CalculateSkewOrSkewp( bool bSkewp ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSkewOrSkewp" ); double fSum, fCount, vSum; std::vector values; if (!CalculateSkew( fSum, fCount, vSum, values)) @@ -3082,7 +3021,6 @@ double ScInterpreter::GetMedian( vector & rArray ) void ScInterpreter::ScMedian() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMedian" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return; @@ -3124,7 +3062,6 @@ double ScInterpreter::GetPercentile( vector & rArray, double fPercentile void ScInterpreter::ScPercentile() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPercentile" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double alpha = GetDouble(); @@ -3140,7 +3077,6 @@ void ScInterpreter::ScPercentile() void ScInterpreter::ScQuartile() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScQuartile" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double fFlag = ::rtl::math::approxFloor(GetDouble()); @@ -3156,7 +3092,6 @@ void ScInterpreter::ScQuartile() void ScInterpreter::ScModalValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScModalValue" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return; @@ -3202,7 +3137,6 @@ void ScInterpreter::ScModalValue() void ScInterpreter::CalculateSmallLarge(bool bSmall) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSmallLarge" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double f = ::rtl::math::approxFloor(GetDouble()); @@ -3232,19 +3166,16 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall) void ScInterpreter::ScLarge() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" ); CalculateSmallLarge(false); } void ScInterpreter::ScSmall() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSmall" ); CalculateSmallLarge(true); } void ScInterpreter::ScPercentrank() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPercentrank" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 2 ) ) return; @@ -3304,7 +3235,6 @@ void ScInterpreter::ScPercentrank() void ScInterpreter::ScTrimMean() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrimMean" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; double alpha = GetDouble(); @@ -3334,7 +3264,6 @@ void ScInterpreter::ScTrimMean() void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector& rArray ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetSortArray" ); ScAddress aAdr; ScRange aRange; short nParam = nParamCount; @@ -3483,7 +3412,6 @@ static void lcl_QuickSort( long nLo, long nHi, vector& rSortArray, vecto void ScInterpreter::QuickSort( vector& rSortArray, vector* pIndexOrder ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::QuickSort" ); long n = static_cast(rSortArray.size()); if (pIndexOrder) @@ -3511,7 +3439,6 @@ void ScInterpreter::QuickSort( vector& rSortArray, vector* pIndexO void ScInterpreter::ScRank() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRank" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 2, 3 ) ) return; @@ -3634,7 +3561,6 @@ void ScInterpreter::ScRank() void ScInterpreter::ScAveDev() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAveDev" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return; @@ -3795,7 +3721,6 @@ void ScInterpreter::ScAveDev() void ScInterpreter::ScDevSq() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDevSq" ); double nVal; double nValCount; GetStVarParams(nVal, nValCount); @@ -3804,7 +3729,6 @@ void ScInterpreter::ScDevSq() void ScInterpreter::ScProbability() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScProbability" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 4 ) ) return; @@ -3870,25 +3794,21 @@ void ScInterpreter::ScProbability() void ScInterpreter::ScCorrel() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCorrel" ); // This is identical to ScPearson() ScPearson(); } void ScInterpreter::ScCovar() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCovar" ); CalculatePearsonCovar(false,false); } void ScInterpreter::ScPearson() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" ); CalculatePearsonCovar(true,false); } void ScInterpreter::CalculatePearsonCovar(bool _bPearson,bool _bStexy) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; ScMatrixRef pMat1 = GetMatrix(); @@ -3974,7 +3894,6 @@ void ScInterpreter::CalculatePearsonCovar(bool _bPearson,bool _bStexy) void ScInterpreter::ScRSQ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRSQ" ); // Same as ScPearson()*ScPearson() ScPearson(); if (!nGlobalError) @@ -3996,12 +3915,10 @@ void ScInterpreter::ScRSQ() void ScInterpreter::ScSTEXY() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" ); CalculatePearsonCovar(true,true); } void ScInterpreter::CalculateSlopeIntercept(bool bSlope) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSlopeIntercept" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; ScMatrixRef pMat1 = GetMatrix(); @@ -4073,19 +3990,16 @@ void ScInterpreter::CalculateSlopeIntercept(bool bSlope) void ScInterpreter::ScSlope() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSlope" ); CalculateSlopeIntercept(true); } void ScInterpreter::ScIntercept() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIntercept" ); CalculateSlopeIntercept(false); } void ScInterpreter::ScForecast() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScForecast" ); if ( !MustHaveParamCount( GetByte(), 3 ) ) return; ScMatrixRef pMat1 = GetMatrix(); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 8688b12c9286..49ee0f52b39d 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -88,7 +87,6 @@ using ::std::auto_ptr; void ScInterpreter::ReplaceCell( ScAddress& rPos ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ReplaceCell" ); size_t ListSize = pDok->aTableOpList.size(); for ( size_t i = 0; i < ListSize; ++i ) { @@ -109,7 +107,6 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos ) void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ReplaceCell" ); ScAddress aCellPos( rCol, rRow, rTab ); size_t ListSize = pDok->aTableOpList.size(); for ( size_t i = 0; i < ListSize; ++i ) @@ -135,7 +132,6 @@ void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsTableOpInRange" ); if ( rRange.aStart == rRange.aEnd ) return false; // not considered to be a range in TableOp sense @@ -155,7 +151,6 @@ bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetCellNumberFormat" ); sal_uLong nFormat; sal_uInt16 nErr; if (rCell.isEmpty()) @@ -263,7 +258,6 @@ double ScInterpreter::ConvertStringToValue( const String& rStr ) } return fValue; #else - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertStringToValue" ); double fValue = 0.0; if (mnStringNoValueError == errCellNoValue) { @@ -549,7 +543,6 @@ void ScInterpreter::GetCellString( OUString& rStr, ScRefCellValue& rCell ) bool ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateDoubleArr" ); // Old Add-Ins are hard limited to sal_uInt16 values. #if MAXCOLCOUNT_DEFINE > USHRT_MAX @@ -637,7 +630,6 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateStringArr" ); // Old Add-Ins are hard limited to sal_uInt16 values. #if MAXCOLCOUNT_DEFINE > USHRT_MAX @@ -736,7 +728,6 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateCellArr" ); // Old Add-Ins are hard limited to sal_uInt16 values. #if MAXCOLCOUNT_DEFINE > USHRT_MAX @@ -861,7 +852,6 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, void ScInterpreter::PushWithoutError( FormulaToken& r ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushWithoutError" ); if ( sp >= MAXSTACK ) SetError( errStackOverflow ); else @@ -879,7 +869,6 @@ void ScInterpreter::PushWithoutError( FormulaToken& r ) void ScInterpreter::Push( FormulaToken& r ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Push" ); if ( sp >= MAXSTACK ) SetError( errStackOverflow ); else @@ -902,7 +891,6 @@ void ScInterpreter::Push( FormulaToken& r ) void ScInterpreter::PushTempToken( FormulaToken* p ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushTempToken" ); if ( sp >= MAXSTACK ) { SetError( errStackOverflow ); @@ -935,7 +923,6 @@ void ScInterpreter::PushTempToken( FormulaToken* p ) void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushTempTokenWithoutError" ); p->IncRef(); if ( sp >= MAXSTACK ) { @@ -957,7 +944,6 @@ void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) void ScInterpreter::PushTempToken( const FormulaToken& r ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushTempToken" ); if (!IfErrorPushError()) PushTempTokenWithoutError( r.Clone()); } @@ -1015,7 +1001,6 @@ void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString, void ScInterpreter::Pop() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Pop" ); if( sp ) sp--; else @@ -1027,7 +1012,6 @@ void ScInterpreter::Pop() void ScInterpreter::PopError() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopError" ); if( sp ) { sp--; @@ -1041,7 +1025,6 @@ void ScInterpreter::PopError() FormulaTokenRef ScInterpreter::PopToken() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopToken" ); if (sp) { sp--; @@ -1058,7 +1041,6 @@ FormulaTokenRef ScInterpreter::PopToken() double ScInterpreter::PopDouble() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDouble" ); nCurFmtType = NUMBERFORMAT_NUMBER; nCurFmtIndex = 0; if( sp ) @@ -1087,7 +1069,6 @@ double ScInterpreter::PopDouble() const OUString& ScInterpreter::PopString() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopString" ); nCurFmtType = NUMBERFORMAT_TEXT; nCurFmtIndex = 0; if( sp ) @@ -1117,7 +1098,6 @@ const OUString& ScInterpreter::PopString() void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ValidateRef" ); SCCOL nCol; SCROW nRow; SCTAB nTab; @@ -1127,7 +1107,6 @@ void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) void ScInterpreter::ValidateRef( const ScComplexRefData & rRef ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ValidateRef" ); ValidateRef( rRef.Ref1); ValidateRef( rRef.Ref2); } @@ -1135,7 +1114,6 @@ void ScInterpreter::ValidateRef( const ScComplexRefData & rRef ) void ScInterpreter::ValidateRef( const ScRefList & rRefList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ValidateRef" ); ScRefList::const_iterator it( rRefList.begin()); ScRefList::const_iterator end( rRefList.end()); for ( ; it != end; ++it) @@ -1148,7 +1126,6 @@ void ScInterpreter::ValidateRef( const ScRefList & rRefList ) void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, SCCOL & rCol, SCROW & rRow, SCTAB & rTab ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::SingleRefToVars" ); if ( rRef.IsColRel() ) rCol = aPos.Col() + rRef.nRelCol; else @@ -1172,7 +1149,6 @@ void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopSingleRef" ); if( sp ) { --sp; @@ -1198,7 +1174,6 @@ void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) void ScInterpreter::PopSingleRef( ScAddress& rAdr ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopSingleRef" ); if( sp ) { --sp; @@ -1233,7 +1208,6 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, bool bDontCheckForTableOp ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToVars" ); const ScComplexRefData& rCRef = p->GetDoubleRef(); SingleRefToVars( rCRef.Ref1, rCol1, rRow1, rTab1); SingleRefToVars( rCRef.Ref2, rCol2, rRow2, rTab2); @@ -1290,7 +1264,6 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, bool bDontCheckForTableOp ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRef" ); if( sp ) { --sp; @@ -1316,7 +1289,6 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, ScRange & rRange, bool bDontCheckForTableOp ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToRange" ); SCCOL nCol; SCROW nRow; SCTAB nTab; @@ -1334,7 +1306,6 @@ void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRefInList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRef" ); if (sp) { formula::FormulaToken* pToken = pStack[ sp-1 ]; @@ -1381,7 +1352,6 @@ void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRe void ScInterpreter::PopDoubleRef( ScRange& rRange, bool bDontCheckForTableOp ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRef" ); if( sp ) { --sp; @@ -1592,7 +1562,6 @@ void ScInterpreter::GetExternalDoubleRef( bool ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRefOrSingleRef" ); switch ( GetStackType() ) { case svDoubleRef : @@ -1616,7 +1585,6 @@ bool ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr ) void ScInterpreter::PopDoubleRefPushMatrix() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRefPushMatrix" ); if ( GetStackType() == svDoubleRef ) { ScMatrixRef pMat = GetMatrix(); @@ -1632,14 +1600,12 @@ void ScInterpreter::PopDoubleRefPushMatrix() ScTokenMatrixMap* ScInterpreter::CreateTokenMatrixMap() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateTokenMatrixMap" ); return new ScTokenMatrixMap; } bool ScInterpreter::ConvertMatrixParameters() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertMatrixParameters" ); sal_uInt16 nParams = pCur->GetParamCount(); OSL_ENSURE( nParams <= sp, "ConvertMatrixParameters: stack/param count mismatch"); SCSIZE nJumpCols = 0, nJumpRows = 0; @@ -1801,7 +1767,6 @@ bool ScInterpreter::ConvertMatrixParameters() ScMatrixRef ScInterpreter::PopMatrix() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopMatrix" ); if( sp ) { --sp; @@ -1873,7 +1838,6 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_ void ScInterpreter::PushDouble(double nVal) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushDouble" ); TreatDoubleError( nVal ); if (!IfErrorPushError()) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); @@ -1882,7 +1846,6 @@ void ScInterpreter::PushDouble(double nVal) void ScInterpreter::PushInt(int nVal) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushInt" ); if (!IfErrorPushError()) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); } @@ -1890,7 +1853,6 @@ void ScInterpreter::PushInt(int nVal) void ScInterpreter::PushStringBuffer( const sal_Unicode* pString ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushStringBuffer" ); if ( pString ) PushString( OUString(pString) ); else @@ -1900,7 +1862,6 @@ void ScInterpreter::PushStringBuffer( const sal_Unicode* pString ) void ScInterpreter::PushString( const String& rString ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushString" ); if (!IfErrorPushError()) PushTempTokenWithoutError( new FormulaStringToken( rString ) ); } @@ -1908,7 +1869,6 @@ void ScInterpreter::PushString( const String& rString ) void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushSingleRef" ); if (!IfErrorPushError()) { ScSingleRefData aRef; @@ -1924,7 +1884,6 @@ void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushDoubleRef" ); if (!IfErrorPushError()) { ScComplexRefData aRef; @@ -1976,7 +1935,6 @@ void ScInterpreter::PushExternalDoubleRef( void ScInterpreter::PushMatrix(const ScMatrixRef& pMat) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushMatrix" ); pMat->SetErrorInterpreter( NULL); // No if (!IfErrorPushError()) because ScMatrix stores errors itself, // but with notifying ScInterpreter via nGlobalError, substituting it would @@ -1989,56 +1947,48 @@ void ScInterpreter::PushMatrix(const ScMatrixRef& pMat) void ScInterpreter::PushError( sal_uInt16 nError ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushError" ); SetError( nError ); // only sets error if not already set PushTempTokenWithoutError( new FormulaErrorToken( nGlobalError)); } void ScInterpreter::PushParameterExpected() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushParameterExpected" ); PushError( errParameterExpected); } void ScInterpreter::PushIllegalParameter() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushIllegalParameter" ); PushError( errIllegalParameter); } void ScInterpreter::PushIllegalArgument() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushIllegalArgument" ); PushError( errIllegalArgument); } void ScInterpreter::PushNA() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushNA" ); PushError( NOTAVAILABLE); } void ScInterpreter::PushNoValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushNoValue" ); PushError( errNoValue); } bool ScInterpreter::IsMissing() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsMissing" ); return sp && pStack[sp - 1]->GetType() == svMissing; } StackVar ScInterpreter::GetRawStackType() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetRawStackType" ); StackVar eRes; if( sp ) { @@ -2055,7 +2005,6 @@ StackVar ScInterpreter::GetRawStackType() StackVar ScInterpreter::GetStackType() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetStackType" ); StackVar eRes; if( sp ) { @@ -2074,7 +2023,6 @@ StackVar ScInterpreter::GetStackType() StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetStackType" ); StackVar eRes; if( sp > nParam-1 ) { @@ -2090,7 +2038,6 @@ StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToPosSingleRef" ); // Check for a singleton first - no implicit intersection for them. if( rRange.aStart == rRange.aEnd ) { @@ -2196,7 +2143,6 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat) double ScInterpreter::GetDouble() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDouble" ); double nVal(0.0); switch( GetRawStackType() ) { @@ -2276,7 +2222,6 @@ double ScInterpreter::GetDouble() double ScInterpreter::GetDoubleWithDefault(double nDefault) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDoubleWithDefault" ); bool bMissing = IsMissing(); double nResultVal = GetDouble(); if ( bMissing ) @@ -2287,7 +2232,6 @@ double ScInterpreter::GetDoubleWithDefault(double nDefault) const OUString& ScInterpreter::GetString() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetString" ); switch (GetRawStackType()) { case svError: @@ -2394,7 +2338,6 @@ const OUString& ScInterpreter::GetStringFromMatrix(const ScMatrixRef& pMat) ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble, OUString& rString ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDoubleOrStringFromMatrix" ); rDouble = 0.0; rString = EMPTY_OUSTRING; @@ -2460,7 +2403,6 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( void ScInterpreter::ScDBGet() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" ); bool bMissingField = false; SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr pQueryParam( GetDBParams(bMissingField) ); @@ -2499,7 +2441,6 @@ void ScInterpreter::ScDBGet() void ScInterpreter::ScExternal() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScExternal" ); sal_uInt8 nParamCount = GetByte(); String aUnoName; String aFuncName( ScGlobal::pCharClass->uppercase( pCur->GetExternal() ) ); @@ -3068,7 +3009,6 @@ void ScInterpreter::ScExternal() void ScInterpreter::ScMissing() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMissing" ); PushTempToken( new FormulaMissingToken ); } @@ -3137,7 +3077,6 @@ static bool lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPa void ScInterpreter::ScMacro() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMacro" ); #ifdef DISABLE_SCRIPTING PushNoValue(); // ohne DocShell kein CallBasic @@ -3437,7 +3376,6 @@ void ScInterpreter::ScMacro() bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::SetSbxVariable" ); bool bOk = true; ScRefCellValue aCell; aCell.assign(*pDok, rPos); @@ -3498,7 +3436,6 @@ public: void ScInterpreter::ScTableOp() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTableOp" ); sal_uInt8 nParamCount = GetByte(); if (nParamCount != 3 && nParamCount != 5) { @@ -3620,7 +3557,6 @@ void ScInterpreter::ScDBArea() void ScInterpreter::ScColRowNameAuto() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScColRowNameAuto" ); ScComplexRefData aRefData( static_cast(pCur)->GetDoubleRef() ); aRefData.CalcAbsIfRel( aPos ); if ( aRefData.Valid() ) @@ -3730,7 +3666,6 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, bCalcAsShown( pDoc->GetDocOptions().IsCalcAsShown() ), meVolatileType(r.IsRecalcModeAlways() ? VOLATILE : NOT_VOLATILE) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTT" ); if(pMyFormulaCell) { @@ -3778,7 +3713,6 @@ const ScCalcConfig& ScInterpreter::GetGlobalConfig() void ScInterpreter::GlobalExit() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GlobalExit" ); OSL_ENSURE(!bGlobalStackInUse, "who is still using the TokenStack?"); DELETEZ(pGlobalStack); } @@ -3786,7 +3720,6 @@ void ScInterpreter::GlobalExit() StackVar ScInterpreter::Interpret() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Interpret" ); short nRetTypeExpr = NUMBERFORMAT_UNDEFINED; sal_uLong nRetIndexExpr = 0; sal_uInt16 nErrorFunction = 0; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index d48cfe7c8feb..ad7d799cd075 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -107,7 +106,6 @@ void lcl_MFastMult(ScMatrixRef pA, ScMatrixRef pB, ScMatrixRef pR, double ScInterpreter::ScGetGCD(double fx, double fy) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::div" ); // By ODFF definition GCD(0,a) => a. This is also vital for the code in // ScGCD() to work correctly with a preset fy=0.0 if (fy == 0.0) @@ -129,7 +127,6 @@ double ScInterpreter::ScGetGCD(double fx, double fy) void ScInterpreter::ScGCD() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGCD" ); short nParamCount = GetByte(); if ( MustHaveParamCountMin( nParamCount, 1 ) ) { @@ -319,7 +316,6 @@ void ScInterpreter:: ScLCM() ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetNewMat" ); ScMatrixRef pMat; if (bEmpty) pMat = new ScMatrix(nC, nR); @@ -388,7 +384,6 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken ScMatrixRef ScInterpreter::GetMatrix() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetMatrix" ); ScMatrixRef pMat = NULL; switch (GetRawStackType()) { @@ -501,7 +496,6 @@ ScMatrixRef ScInterpreter::GetMatrix() void ScInterpreter::ScMatValue() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatValue" ); if ( MustHaveParamCount( GetByte(), 3 ) ) { // 0 to count-1 @@ -575,7 +569,6 @@ void ScInterpreter::ScMatValue() } void ScInterpreter::CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateMatrixValue" ); if (pMat) { SCSIZE nCl, nRw; @@ -599,7 +592,6 @@ void ScInterpreter::CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE n void ScInterpreter::ScEMat() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScEMat" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { SCSIZE nDim = static_cast(::rtl::math::approxFloor(GetDouble())); @@ -621,7 +613,6 @@ void ScInterpreter::ScEMat() void ScInterpreter::MEMat(const ScMatrixRef& mM, SCSIZE n) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::MEMat" ); mM->FillDouble(0.0, 0, 0, n-1, n-1); for (SCSIZE i = 0; i < n; i++) mM->PutDouble(1.0, i, i); @@ -789,7 +780,6 @@ static void lcl_LUP_solve( const ScMatrix* mLU, const SCSIZE n, void ScInterpreter::ScMatDet() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatDet" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { ScMatrixRef pMat = GetMatrix(); @@ -835,7 +825,6 @@ void ScInterpreter::ScMatDet() void ScInterpreter::ScMatInv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatInv" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { ScMatrixRef pMat = GetMatrix(); @@ -941,7 +930,6 @@ void ScInterpreter::ScMatInv() void ScInterpreter::ScMatMult() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatMult" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { ScMatrixRef pMat2 = GetMatrix(); @@ -991,7 +979,6 @@ void ScInterpreter::ScMatMult() void ScInterpreter::ScMatTrans() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatTrans" ); if ( MustHaveParamCount( GetByte(), 1 ) ) { ScMatrixRef pMat = GetMatrix(); @@ -1066,7 +1053,6 @@ static ScMatrixRef lcl_MatrixCalculation( ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef& pMat2) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::MatConcat" ); SCSIZE nC1, nC2, nMinC; SCSIZE nR1, nR2, nMinR; SCSIZE i, j; @@ -1129,12 +1115,10 @@ static void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt void ScInterpreter::ScAdd() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAdd" ); CalculateAddSub(false); } void ScInterpreter::CalculateAddSub(bool _bSub) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateAddSub" ); ScMatrixRef pMat1 = NULL; ScMatrixRef pMat2 = NULL; double fVal1 = 0.0, fVal2 = 0.0; @@ -1267,7 +1251,6 @@ void ScInterpreter::CalculateAddSub(bool _bSub) void ScInterpreter::ScAmpersand() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAmpersand" ); ScMatrixRef pMat1 = NULL; ScMatrixRef pMat2 = NULL; String sStr1, sStr2; @@ -1361,13 +1344,11 @@ void ScInterpreter::ScAmpersand() void ScInterpreter::ScSub() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSub" ); CalculateAddSub(true); } void ScInterpreter::ScMul() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMul" ); ScMatrixRef pMat1 = NULL; ScMatrixRef pMat2 = NULL; double fVal1 = 0.0, fVal2 = 0.0; @@ -1445,7 +1426,6 @@ void ScInterpreter::ScMul() void ScInterpreter::ScDiv() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDiv" ); ScMatrixRef pMat1 = NULL; ScMatrixRef pMat2 = NULL; double fVal1 = 0.0, fVal2 = 0.0; @@ -1535,14 +1515,12 @@ void ScInterpreter::ScDiv() void ScInterpreter::ScPower() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPower" ); if ( MustHaveParamCount( GetByte(), 2 ) ) ScPow(); } void ScInterpreter::ScPow() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPow" ); ScMatrixRef pMat1 = NULL; ScMatrixRef pMat2 = NULL; double fVal1 = 0.0, fVal2 = 0.0; @@ -1628,7 +1606,6 @@ public: void ScInterpreter::ScSumProduct() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumProduct" ); sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 1, 30 ) ) return; @@ -1672,12 +1649,10 @@ void ScInterpreter::ScSumProduct() void ScInterpreter::ScSumX2MY2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumX2MY2" ); CalculateSumX2MY2SumX2DY2(false); } void ScInterpreter::CalculateSumX2MY2SumX2DY2(bool _bSumX2DY2) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSumX2MY2SumX2DY2" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1718,13 +1693,11 @@ void ScInterpreter::CalculateSumX2MY2SumX2DY2(bool _bSumX2DY2) void ScInterpreter::ScSumX2DY2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumX2DY2" ); CalculateSumX2MY2SumX2DY2(true); } void ScInterpreter::ScSumXMY2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumXMY2" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -1767,7 +1740,6 @@ void ScInterpreter::ScSumXMY2() void ScInterpreter::ScFrequency() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFrequency" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) return; @@ -2301,14 +2273,12 @@ bool ScInterpreter::CheckMatrix(bool _bLOG, sal_uInt8& nCase, SCSIZE& nCX, // LINEST void ScInterpreter::ScRGP() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRGP" ); CalulateRGPRKP(false); } // LOGEST void ScInterpreter::ScRKP() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRKP" ); CalulateRGPRKP(true); } @@ -2833,13 +2803,11 @@ void ScInterpreter::CalulateRGPRKP(bool _bRKP) void ScInterpreter::ScTrend() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrend" ); CalculateTrendGrowth(false); } void ScInterpreter::ScGrowth() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGrowth" ); CalculateTrendGrowth(true); } @@ -3145,7 +3113,6 @@ void ScInterpreter::CalculateTrendGrowth(bool _bGrowth) void ScInterpreter::ScMatRef() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatRef" ); // Falls Deltarefs drin sind... Push( (FormulaToken&)*pCur ); ScAddress aAdr; @@ -3219,7 +3186,6 @@ void ScInterpreter::ScMatRef() void ScInterpreter::ScInfo() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScInfo" ); if( MustHaveParamCount( GetByte(), 1 ) ) { String aStr = GetString(); diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 03d87a904bf6..4dbbf1db91cc 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -27,7 +27,6 @@ #include "mtvcellfunc.hxx" #include "formula/token.hxx" -#include using namespace formula; @@ -42,7 +41,6 @@ double const fHalfMachEps = 0.5 * ::std::numeric_limits::epsilon(); uses continued fraction with odd items */ double ScInterpreter::GetGammaContFraction( double fA, double fX ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetGammaContFraction" ); double const fBigInv = ::std::numeric_limits::epsilon(); double const fBig = 1.0/fBigInv; @@ -99,7 +97,6 @@ double ScInterpreter::GetGammaContFraction( double fA, double fX ) uses power series */ double ScInterpreter::GetGammaSeries( double fA, double fX ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetGammaSeries" ); double fDenomfactor = fA; double fSummand = 1.0/fA; double fSum = fSummand; @@ -123,7 +120,6 @@ double ScInterpreter::GetGammaSeries( double fA, double fX ) /** You must ensure fA>0.0 && fX>0.0) */ double ScInterpreter::GetLowRegIGamma( double fA, double fX ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetLowRegIGamma" ); double fLnFactor = fA * log(fX) - fX - GetLogGamma(fA); double fFactor = exp(fLnFactor); // Do we need more accuracy than exp(ln()) has? if (fX>fA+1.0) // includes fX>1.0; 1-GetUpRegIGamma, continued fraction @@ -135,7 +131,6 @@ double ScInterpreter::GetLowRegIGamma( double fA, double fX ) /** You must ensure fA>0.0 && fX>0.0) */ double ScInterpreter::GetUpRegIGamma( double fA, double fX ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetUpRegIGamma" ); double fLnFactor= fA*log(fX)-fX-GetLogGamma(fA); double fFactor = exp(fLnFactor); //Do I need more accuracy than exp(ln()) has?; @@ -150,7 +145,6 @@ double ScInterpreter::GetUpRegIGamma( double fA, double fX ) You must ensure fAlpha>0.0 and fLambda>0.0 */ double ScInterpreter::GetGammaDistPDF( double fX, double fAlpha, double fLambda ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetGammaDistPDF" ); if (fX < 0.0) return 0.0; // see ODFF else if (fX == 0) @@ -205,7 +199,6 @@ double ScInterpreter::GetGammaDistPDF( double fX, double fAlpha, double fLambda You must ensure fAlpha>0.0 and fLambda>0.0 */ double ScInterpreter::GetGammaDist( double fX, double fAlpha, double fLambda ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetGammaDist" ); if (fX <= 0.0) return 0.0; else @@ -386,7 +379,6 @@ void IterateMatrix( double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IterateParameters" ); short nParamCount = GetByte(); double fRes = ( eFunc == ifPRODUCT ) ? 1.0 : 0.0; double fVal = 0.0; @@ -729,7 +721,6 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) void ScInterpreter::ScSumSQ() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumSQ" ); PushDouble( IterateParameters( ifSUMSQ ) ); } @@ -867,14 +858,12 @@ void ScInterpreter::ScSum() void ScInterpreter::ScProduct() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScProduct" ); PushDouble( IterateParameters( ifPRODUCT ) ); } void ScInterpreter::ScAverage( bool bTextAsZero ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAverage" ); PushDouble( IterateParameters( ifAVERAGE, bTextAsZero ) ); } @@ -1032,7 +1021,6 @@ void ScInterpreter::ScCount() void ScInterpreter::ScCount2() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCount2" ); PushDouble( IterateParameters( ifCOUNT2 ) ); } diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 06f0cd6810b0..adeb3d8b7491 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -41,7 +41,6 @@ #include #include -#include #include #include #include @@ -4259,8 +4258,6 @@ XclImpSheetDrawing& XclImpObjectManager::GetSheetDrawing( SCTAB nScTab ) void XclImpObjectManager::ConvertObjects() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sc", "dr104026", "XclImpObjectManager::ConvertObjects" ); - // do nothing if the document does not contain a drawing layer if( !GetDoc().GetDrawLayer() ) return; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index b09d16932a37..7a05eb5c12d1 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -314,8 +313,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference xContext = comphelper::getProcessComponentContext(); xml::sax::InputSource aParserInput; @@ -459,7 +456,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) uno::Any* pMetaArgs = aMetaArgs.getArray(); pMetaArgs[0] <<= xInfoSet; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import start" ); + SAL_INFO( "sc.filter", "meta import start" ); nMetaRetval = ImportFromComponent( xContext, xModel, xXMLParser, aParserInput, @@ -467,7 +464,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) : OUString("com.sun.star.comp.Calc.XMLMetaImporter"), "meta.xml", "Meta.xml", aMetaArgs, false); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import end" ); + SAL_INFO( "sc.filter", "meta import end" ); SvXMLGraphicHelper* pGraphicHelper = NULL; uno::Reference< document::XGraphicObjectResolver > xGrfContainer; @@ -503,7 +500,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) uno::Any* pSettingsArgs = aSettingsArgs.getArray(); pSettingsArgs[0] <<= xInfoSet; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import start" ); + SAL_INFO( "sc.filter", "settings import start" ); nSettingsRetval = ImportFromComponent( xContext, xModel, xXMLParser, aParserInput, @@ -511,12 +508,12 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) : OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), "settings.xml", sEmpty, aSettingsArgs, false); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import end" ); + SAL_INFO( "sc.filter", "settings import end" ); } sal_uInt32 nStylesRetval(0); { - RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); + SAL_INFO( "sc.filter", "styles import start" ); nStylesRetval = ImportFromComponent(xContext, xModel, xXMLParser, aParserInput, bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") @@ -524,7 +521,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); + SAL_INFO( "sc.filter", "styles import end" ); } sal_uInt32 nDocRetval(0); @@ -537,7 +534,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) pDocArgs[2] <<= xStatusIndicator; pDocArgs[3] <<= xObjectResolver; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); + SAL_INFO( "sc.filter", "content import start" ); nDocRetval = ImportFromComponent(xContext, xModel, xXMLParser, aParserInput, bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") @@ -546,7 +543,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) OUString("Content.xml"), aDocArgs, sal_True); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); + SAL_INFO( "sc.filter", "content import end" ); } if( pGraphicHelper ) SvXMLGraphicHelper::Destroy( pGraphicHelper ); @@ -766,8 +763,6 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(const uno::Reference xContext(comphelper::getProcessComponentContext()); uno::Reference xWriter = xml::sax::Writer::create(xContext); @@ -887,7 +882,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) pMetaArgs[1] <<= xWriter; pMetaArgs[2] <<= xStatusIndicator; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); + SAL_INFO( "sc.filter", "meta export start" ); bMetaRet = ExportToComponent(xContext, xModel, xWriter, aDescriptor, OUString("meta.xml"), @@ -896,7 +891,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) : OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); + SAL_INFO( "sc.filter", "meta export end" ); } uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; @@ -928,7 +923,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) pStylesArgs[3] <<= xWriter; pStylesArgs[4] <<= xObjectResolver; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); + SAL_INFO( "sc.filter", "styles export start" ); bStylesRet = ExportToComponent(xContext, xModel, xWriter, aDescriptor, OUString("styles.xml"), @@ -937,7 +932,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) : OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); + SAL_INFO( "sc.filter", "styles export end" ); } // content export @@ -952,7 +947,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) pDocArgs[3] <<= xWriter; pDocArgs[4] <<= xObjectResolver; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); + SAL_INFO( "sc.filter", "content export start" ); bDocRet = ExportToComponent(xContext, xModel, xWriter, aDescriptor, OUString("content.xml"), @@ -961,7 +956,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) : OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); + SAL_INFO( "sc.filter", "content export end" ); } if( pGraphicHelper ) @@ -980,7 +975,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) pSettingsArgs[1] <<= xWriter; pSettingsArgs[2] <<= xStatusIndicator; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); + SAL_INFO( "sc.filter", "settings export start" ); bSettingsRet = ExportToComponent(xContext, xModel, xWriter, aDescriptor, OUString("settings.xml"), @@ -989,7 +984,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) : OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); + SAL_INFO( "sc.filter", "settings export end" ); } if (pSharedData) diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 553399fe2903..cb6929ecd908 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -112,7 +112,6 @@ #include "editutil.hxx" #include // SdrRegisterFieldClasses -#include #include "dwfunctr.hxx" #include "acredlin.hxx" @@ -131,8 +130,6 @@ ScResId::ScResId( sal_uInt16 nId ) : void ScDLL::Init() { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDLL::Init" ); - ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC); if ( *ppShlPtr ) return; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index c38b3973af7a..33535ac59835 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -108,7 +108,6 @@ #include "docshimp.hxx" #include "sizedev.hxx" -#include #include #include @@ -488,8 +487,6 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un sal_Bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::SaveXML" ); - aDocument.EnableIdle(false); ScXMLImportWrapper aImport( aDocument, pSaveMedium, xStor ); @@ -529,7 +526,6 @@ bool ScDocShell::SaveCurrentChart( SfxMedium& rMedium ) sal_Bool ScDocShell::Load( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" ); LoadMediumGuard aLoadGuard(&aDocument); ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); @@ -955,7 +951,6 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) sal_Bool ScDocShell::LoadFrom( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" ); LoadMediumGuard aLoadGuard(&aDocument); ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); @@ -1011,8 +1006,6 @@ static void lcl_parseHtmlFilterOption(const OUString& rOption, LanguageType& rLa sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" ); - LoadMediumGuard aLoadGuard(&aDocument); sal_Bool bRet = false; // sal_False heisst Benutzerabbruch !! @@ -1574,8 +1567,6 @@ ScDocShell::PrepareSaveGuard::~PrepareSaveGuard() sal_Bool ScDocShell::Save() { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Save" ); - ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); PrepareSaveGuard aPrepareGuard( *this); @@ -2158,8 +2149,6 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertTo" ); - ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); // #i6500# don't call DoEnterHandler here (doesn't work with AutoSave), @@ -2621,8 +2610,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : , mpCollaboration( new ScCollaboration( this ) ) #endif { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); - SetPool( &SC_MOD()->GetPool() ); bIsInplace = rShell.bIsInplace; @@ -2670,8 +2657,6 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : , mpCollaboration( new ScCollaboration( this ) ) #endif { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); - SetPool( &SC_MOD()->GetPool() ); bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED); diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 79f1c1057b40..f8a7b78700d8 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include "drwlayer.hxx" #include "stlpool.hxx" @@ -37,8 +36,6 @@ using namespace com::sun::star; sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::InitNew" ); - sal_Bool bRet = SfxObjectShell::InitNew( xStor ); aDocument.MakeTable(0); @@ -181,8 +178,6 @@ ScDrawLayer* ScDocShell::MakeDrawLayer() ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); if (!pDrawLayer) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::MakeDrawLayer" ); - aDocument.InitDrawLayer(this); pDrawLayer = aDocument.GetDrawLayer(); InitItems(); // incl. Undo und Basic diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index d99cb030ab03..ce430868d694 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -44,7 +44,6 @@ #include #include -#include #include #include #include diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index cedfb1a1559f..5a431dc41ac8 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -49,7 +49,6 @@ #include #include #include -#include #include "tabview.hxx" #include "tabvwsh.hxx" @@ -256,8 +255,6 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView bBlockCols( false ), bBlockRows( false ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabView::ScTabView" ); - Init(); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 377546fb9120..b1d55895a854 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -1675,8 +1674,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, ScDBFunc( &pViewFrame->GetWindow(), (ScDocShell&)*pViewFrame->GetObjectShell(), this ), __INIT_ScTabViewShell { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); - const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); // if switching back from print preview, -- cgit v1.2.3