basic/source/sbx/sbxvalue.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 726344abbbec4beab5525c7890a360f9877d1ffa Author: Noel Power <noel.po...@novell.com> Date: Thu Jan 12 15:46:52 2012 +0000 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 diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index e21234c..6d9d718 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; } } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits