Kaydet (Commit) 7c18b784 authored tarafından Noel Power's avatar Noel Power Kaydeden (comit) Michael Stahl

restore special DATE handling code for SbxValue::Compute fdo#44385

restore code that seemed to be erroneously moved as part of the currency enhancement feature
Signed-off-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst a4bd804f
......@@ -1264,16 +1264,6 @@ Lbl_OpIsDouble:
else aL.nDouble /= aR.nDouble; break;
case SbxPLUS:
aL.nDouble += aR.nDouble; break;
#if 0
// See 'break' on preceding line... this
// is unreachable code. Do not delete this
// #if 0 block unless you know for sure
// the 'break' above is intentional.
// #45465 Date needs with "+" a special handling: forces date type
if( GetType() == SbxDATE || rOp.GetType() == SbxDATE )
aL.eType = SbxDATE;
#endif
case SbxMINUS:
aL.nDouble -= aR.nDouble; break;
case SbxNEG:
......@@ -1282,6 +1272,11 @@ Lbl_OpIsDouble:
SetError( SbxERR_NOTIMP );
}
// #45465 Date needs with "+" a special handling: forces date type
if( eOp == SbxPLUS && (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) )
aL.eType = SbxDATE;
}
}
......
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