basic/source/sbx/sbxvalue.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
New commits: commit 9df90559d40f029479c4481e31f88737b70742f6 Author: Noel Power <noel.po...@novell.com> Date: Mon Jan 9 13:09:37 2012 +0000 restore special DATE handling code for SbxValue::Compute 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 7f00ecc..add49e1 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -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: @@ -1281,6 +1271,9 @@ Lbl_OpIsDouble: default: SetError( SbxERR_NOTIMP ); } + // #45465 Date needs with "+" a special handling: forces date type + if( 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