Kaydet (Commit) 0a03aedf authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:bodynotinblock

Change-Id: I7b53113c0665fbd705b9110075f0d707c7798fdd
üst 84bdb12d
......@@ -572,19 +572,19 @@ bool ScValidationData::IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos
break;
case SC_COND_BETWEEN:
if (nComp2 < nComp1) // time wraparound
bOk = ( nInVal >= nComp1 || nInVal <= nComp2 ) ||
::rtl::math::approxEqual( nInVal, nComp1 ) || ::rtl::math::approxEqual( nInVal, nComp2 );
bOk = ( nInVal >= nComp1 || nInVal <= nComp2 ) ||
::rtl::math::approxEqual( nInVal, nComp1 ) || ::rtl::math::approxEqual( nInVal, nComp2 );
else
bOk = ( nInVal >= nComp1 && nInVal <= nComp2 ) ||
::rtl::math::approxEqual( nInVal, nComp1 ) || ::rtl::math::approxEqual( nInVal, nComp2 );
bOk = ( nInVal >= nComp1 && nInVal <= nComp2 ) ||
::rtl::math::approxEqual( nInVal, nComp1 ) || ::rtl::math::approxEqual( nInVal, nComp2 );
break;
case SC_COND_NOTBETWEEN:
if (nComp2 < nComp1) // time wraparound
bOk = ( nInVal < nComp1 && nInVal > nComp2 ) &&
!::rtl::math::approxEqual( nInVal, nComp1 ) && !::rtl::math::approxEqual( nInVal, nComp2 );
bOk = ( nInVal < nComp1 && nInVal > nComp2 ) &&
!::rtl::math::approxEqual( nInVal, nComp1 ) && !::rtl::math::approxEqual( nInVal, nComp2 );
else
bOk = ( nInVal < nComp1 || nInVal > nComp2 ) &&
!::rtl::math::approxEqual( nInVal, nComp1 ) && !::rtl::math::approxEqual( nInVal, nComp2 );
bOk = ( nInVal < nComp1 || nInVal > nComp2 ) &&
!::rtl::math::approxEqual( nInVal, nComp1 ) && !::rtl::math::approxEqual( nInVal, nComp2 );
break;
default:
SAL_WARN("sc", "unknown operation at ScValidationData::IsDataValid()");
......
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