diff options
| author | Noel Power <noel.power@novell.com> | 2012-01-12 15:46:52 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-01-13 09:53:08 +0000 |
| commit | 726344abbbec4beab5525c7890a360f9877d1ffa (patch) | |
| tree | 108fdf06f00b7b07bf160e719a098c0ddb21186e | |
| parent | 0d7e8c41cfe5b93e52df03bd0c7420956a98814b (diff) | |
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
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index e21234ccac..6d9d71877c 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1311,9 +1311,6 @@ Lbl_OpIsDouble: else aL.nDouble /= aR.nDouble; break; case SbxPLUS: aL.nDouble += aR.nDouble; break; - // #45465 Date needs with "+" a special handling: forces date type - if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) - aL.eType = SbxDATE; case SbxMINUS: aL.nDouble -= aR.nDouble; break; case SbxNEG: @@ -1321,6 +1318,9 @@ Lbl_OpIsDouble: default: SetError( SbxERR_NOTIMP ); } + // #45465 Date needs with "+" a special handling: forces date type + if( Op == SbxPLUS && (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) + aL.eType = SbxDATE; } } |