Kaydet (Commit) d00513ab authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Add some logging to sw calc

Change-Id: I4cadbb928ab0fbb407e9d569e77e6c20229e1810
Reviewed-on: https://gerrit.libreoffice.org/64940
Tested-by: Jenkins
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst f611179a
...@@ -509,6 +509,7 @@ certain functionality. ...@@ -509,6 +509,7 @@ certain functionality.
@li @c sw @li @c sw
@li @c sw.a11y - accessibility @li @c sw.a11y - accessibility
@li @c sw.calc - formula calculation
@li @c sw.core - Writer core @li @c sw.core - Writer core
@li @c sw.createcopy @li @c sw.createcopy
@li @c sw.doc @li @c sw.doc
......
...@@ -1033,25 +1033,32 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1033,25 +1033,32 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
switch (m_eCurrOper) switch (m_eCurrOper)
{ {
case CALC_SIN: case CALC_SIN:
SAL_INFO("sw.calc", "sin");
return StdFunc(&sin, false); return StdFunc(&sin, false);
break; break;
case CALC_COS: case CALC_COS:
SAL_INFO("sw.calc", "cos");
return StdFunc(&cos, false); return StdFunc(&cos, false);
break; break;
case CALC_TAN: case CALC_TAN:
SAL_INFO("sw.calc", "tan");
return StdFunc(&tan, false); return StdFunc(&tan, false);
break; break;
case CALC_ATAN: case CALC_ATAN:
SAL_INFO("sw.calc", "atan");
return StdFunc(&atan, false); return StdFunc(&atan, false);
break; break;
case CALC_ASIN: case CALC_ASIN:
SAL_INFO("sw.calc", "asin");
return StdFunc(&asin, true); return StdFunc(&asin, true);
break; break;
case CALC_ACOS: case CALC_ACOS:
SAL_INFO("sw.calc", "acos");
return StdFunc(&acos, true); return StdFunc(&acos, true);
break; break;
case CALC_NOT: case CALC_NOT:
{ {
SAL_INFO("sw.calc", "not");
GetToken(); GetToken();
SwSbxValue nErg = Prim(); SwSbxValue nErg = Prim();
if( SbxSTRING == nErg.GetType() ) if( SbxSTRING == nErg.GetType() )
...@@ -1079,6 +1086,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1079,6 +1086,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_NUMBER: case CALC_NUMBER:
{ {
SAL_INFO("sw.calc", "number: " << m_nNumberValue.GetDouble());
SwSbxValue nErg; SwSbxValue nErg;
if( GetToken() == CALC_PHD ) if( GetToken() == CALC_PHD )
{ {
...@@ -1101,6 +1109,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1101,6 +1109,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_NAME: case CALC_NAME:
{ {
SAL_INFO("sw.calc", "name");
SwSbxValue nErg; SwSbxValue nErg;
switch(SwCalcOper eOper = GetToken()) switch(SwCalcOper eOper = GetToken())
{ {
...@@ -1126,6 +1135,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1126,6 +1135,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_MINUS: case CALC_MINUS:
{ {
SAL_INFO("sw.calc", "-");
SwSbxValue nErg; SwSbxValue nErg;
GetToken(); GetToken();
nErg.PutDouble( -(Prim().GetDouble()) ); nErg.PutDouble( -(Prim().GetDouble()) );
...@@ -1134,6 +1144,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1134,6 +1144,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_LP: case CALC_LP:
{ {
SAL_INFO("sw.calc", "(");
GetToken(); GetToken();
SwSbxValue nErg = Expr(); SwSbxValue nErg = Expr();
if( m_eCurrOper != CALC_RP ) if( m_eCurrOper != CALC_RP )
...@@ -1150,6 +1161,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1150,6 +1161,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_MEAN: case CALC_MEAN:
{ {
SAL_INFO("sw.calc", "mean");
m_nListPor = 1; m_nListPor = 1;
GetToken(); GetToken();
SwSbxValue nErg = Expr(); SwSbxValue nErg = Expr();
...@@ -1161,6 +1173,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1161,6 +1173,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_SQRT: case CALC_SQRT:
{ {
SAL_INFO("sw.calc", "sqrt");
GetToken(); GetToken();
SwSbxValue nErg = Prim(); SwSbxValue nErg = Prim();
if( nErg.GetDouble() < 0 ) if( nErg.GetDouble() < 0 )
...@@ -1175,6 +1188,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1175,6 +1188,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
case CALC_MIN: case CALC_MIN:
case CALC_MAX: case CALC_MAX:
{ {
SAL_INFO("sw.calc", "sum/date/min/max");
GetToken(); GetToken();
SwSbxValue nErg = Expr(); SwSbxValue nErg = Expr();
return nErg; return nErg;
...@@ -1182,12 +1196,14 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow) ...@@ -1182,12 +1196,14 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
} }
case CALC_ENDCALC: case CALC_ENDCALC:
{ {
SAL_INFO("sw.calc", "endcalc");
SwSbxValue nErg; SwSbxValue nErg;
nErg.Clear(); nErg.Clear();
return nErg; return nErg;
break; break;
} }
default: default:
SAL_INFO("sw.calc", "syntax error");
m_eError = SwCalcError::Syntax; m_eError = SwCalcError::Syntax;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment