summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-01-09 13:09:37 +0000
committerNoel Power <noel.power@novell.com>2012-01-09 13:12:38 +0000
commit9df90559d40f029479c4481e31f88737b70742f6 (patch)
tree2d0857268206fb73a8b18280cd835220b71a38f8
parentd979e52a6a8cf05da31a10bd2e5ecad1b19dddc7 (diff)
restore special DATE handling code for SbxValue::Compute
restore code that seemed to be erroneously moved as part of the currency enhancement feature
-rw-r--r--basic/source/sbx/sbxvalue.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 7f00eccb3a51..add49e101a8a 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;
}
}