mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enforce some form of consistent indent here

Browse Source 
Change-Id: Ib26aaa29861e940748a31a3df7f8c5f0408e8c13
This commit is contained in:
Caolán McNamara
2016-09-29 21:12:57 +01:00
parent ea2b56a72a
commit a218467c93
1 changed files with 80 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
sw/source/core/bastyp/calc.cxx
View File

@@ -1040,16 +1040,29 @@ SwSbxValue SwCalc::Prim()
bool bChkTrig = false, bChkPow = false; bool bChkTrig = false, bChkPow = false;
switch( m_eCurrOper ) switch (m_eCurrOper)
{ {
case CALC_SIN: pFnc = &sin; break; case CALC_SIN:
case CALC_COS: pFnc = &cos; break; pFnc = &sin;
case CALC_TAN: pFnc = &tan; break; break;
case CALC_ATAN: pFnc = &atan; break; case CALC_COS:
case CALC_ASIN: pFnc = &asin; bChkTrig = true; break; pFnc = &cos;
case CALC_ACOS: pFnc = &acos; bChkTrig = true; break; break;
case CALC_TAN:
case CALC_NOT: pFnc = &tan;
break;
case CALC_ATAN:
pFnc = &atan;
break;
case CALC_ASIN:
pFnc = &asin;
bChkTrig = true;
break;
case CALC_ACOS:
pFnc = &acos;
bChkTrig = true;
break;
case CALC_NOT:
{ {
GetToken(); GetToken();
nErg = Prim(); nErg = Prim();
@@ -1073,55 +1086,56 @@ SwSbxValue SwCalc::Prim()
//!! computes a binary NOT //!! computes a binary NOT
nErg.Compute( SbxNOT, nErg ); nErg.Compute( SbxNOT, nErg );
} }
break;
} }
break; case CALC_NUMBER:
case CALC_NUMBER:
if( GetToken() == CALC_PHD )
{ {
double aTmp = m_nNumberValue.GetDouble(); if( GetToken() == CALC_PHD )
aTmp *= 0.01; {
nErg.PutDouble( aTmp ); double aTmp = m_nNumberValue.GetDouble();
GetToken(); aTmp *= 0.01;
nErg.PutDouble( aTmp );
GetToken();
}
else if( m_eCurrOper == CALC_NAME )
{
m_eError = CALC_SYNTAX;
}
else
{
nErg = m_nNumberValue;
bChkPow = true;
}
break;
} }
else if( m_eCurrOper == CALC_NAME ) case CALC_NAME:
{ {
m_eError = CALC_SYNTAX; switch(SwCalcOper eOper = GetToken())
} {
else case CALC_ASSIGN:
{
nErg = m_nNumberValue;
bChkPow = true;
}
break;
case CALC_NAME:
switch(SwCalcOper eOper = GetToken())
{
case CALC_ASSIGN:
{ {
SwCalcExp* n = VarInsert(m_aVarName); SwCalcExp* n = VarInsert(m_aVarName);
GetToken(); GetToken();
nErg = n->nValue = Expr(); nErg = n->nValue = Expr();
break;
} }
break; default:
default: nErg = VarLook(m_aVarName)->nValue;
nErg = VarLook(m_aVarName)->nValue; // Explicitly disallow unknown function names (followed by "("),
// Explicitly disallow unknown function names (followed by "("), // allow unknown variable names (equal to zero)
// allow unknown variable names (equal to zero) if (nErg.IsVoidValue() && (eOper == CALC_LP))
if (nErg.IsVoidValue() && (eOper == CALC_LP)) m_eError = CALC_SYNTAX;
m_eError = CALC_SYNTAX; else
else bChkPow = true;
bChkPow = true; break;
}
break;
} }
break; case CALC_MINUS:
GetToken();
case CALC_MINUS: nErg.PutDouble( -(Prim().GetDouble()) );
GetToken(); break;
nErg.PutDouble( -(Prim().GetDouble()) ); case CALC_LP:
break;
case CALC_LP:
{ {
GetToken(); GetToken();
nErg = Expr(); nErg = Expr();
@@ -1134,10 +1148,9 @@ SwSbxValue SwCalc::Prim()
GetToken(); GetToken();
bChkPow = true; // in order for =(7)^2 to work bChkPow = true; // in order for =(7)^2 to work
} }
break;
} }
break; case CALC_MEAN:
case CALC_MEAN:
{ {
m_nListPor = 1; m_nListPor = 1;
GetToken(); GetToken();
@@ -1145,10 +1158,9 @@ SwSbxValue SwCalc::Prim()
double aTmp = nErg.GetDouble(); double aTmp = nErg.GetDouble();
aTmp /= m_nListPor; aTmp /= m_nListPor;
nErg.PutDouble( aTmp ); nErg.PutDouble( aTmp );
break;
} }
break; case CALC_SQRT:
case CALC_SQRT:
{ {
GetToken(); GetToken();
nErg = Prim(); nErg = Prim();
@@ -1156,24 +1168,21 @@ SwSbxValue SwCalc::Prim()
m_eError = CALC_OVERFLOW; m_eError = CALC_OVERFLOW;
else else
nErg.PutDouble( sqrt( nErg.GetDouble() )); nErg.PutDouble( sqrt( nErg.GetDouble() ));
break;
} }
break; case CALC_SUM:
case CALC_DATE:
case CALC_SUM: case CALC_MIN:
case CALC_DATE: case CALC_MAX:
case CALC_MIN: GetToken();
case CALC_MAX: nErg = Expr();
GetToken(); break;
nErg = Expr(); case CALC_ENDCALC:
break; nErg.Clear();
break;
case CALC_ENDCALC: default:
nErg.Clear(); m_eError = CALC_SYNTAX;
break; break;
default:
m_eError = CALC_SYNTAX;
break;
} }
if( pFnc ) if( pFnc )