diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:51:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:51:35 +0000 |
| commit | 35f58316beb30c626c52096af06129f4a516214c (patch) | |
| tree | f0fad72487176a704ca4adf39a534674a0413be2 /basic/source/sbx | |
| parent | b61395a7af1aacf68c63990f4851c0fdfb862cee (diff) | |
INTEGRATION: CWS warnings01 (1.3.28); FILE MERGED
2005/11/07 12:02:58 ab 1.3.28.1: #i53898# Removed warnings
Diffstat (limited to 'basic/source/sbx')
| -rw-r--r-- | basic/source/sbx/sbxuint.cxx | 15 | ||||
| -rw-r--r-- | basic/source/sbx/sbxulng.cxx | 13 |
2 files changed, 7 insertions, 21 deletions
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index dfdadcc41fb5..f19c4ee3c75b 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sbxuint.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 21:53:26 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:51:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,12 +51,7 @@ start: case SbxEMPTY: nRes = 0; break; case SbxCHAR: - if( p->nChar < 0 ) - { - SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0; - } - else - nRes = p->nChar; + nRes = p->nChar; break; case SbxBYTE: nRes = p->nByte; break; @@ -300,10 +295,6 @@ start: } case SbxBYREF | SbxCHAR: - if( n > SbxMAXCHAR ) - { - SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXCHAR; - } *p->pChar = (xub_Unicode) n; break; case SbxBYREF | SbxBYTE: if( n > SbxMAXBYTE ) diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index 5e8fc317304e..63db3e6cb790 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sbxulng.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 21:53:42 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:51:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,12 +51,7 @@ start: case SbxEMPTY: nRes = 0; break; case SbxCHAR: - if( p->nChar < 0 ) - { - SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0; - } - else - nRes = p->nChar; + nRes = p->nChar; break; case SbxBYTE: nRes = p->nByte; break; @@ -318,7 +313,7 @@ start: case SbxBYREF | SbxCURRENCY: if( n > SbxMAXCURR ) { - SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXCURR; + SbxBase::SetError( SbxERR_OVERFLOW ); n = sal::static_int_cast<UINT32>( SbxMAXCURR ); } *p->pLong64 = ImpDoubleToCurrency( (double)n ); break; |