diff options
Diffstat (limited to 'basic/source')
| -rw-r--r-- | basic/source/comp/exprnode.cxx | 9 | ||||
| -rw-r--r-- | basic/source/runtime/stdobj1.cxx | 3 | ||||
| -rw-r--r-- | basic/source/sbx/sbxscan.cxx | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index 10c98942d492..49911c1ad344 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -313,11 +313,9 @@ void SbiExprNode::FoldConstants() // Integer operations sal_Bool err = sal_False; if( nl > SbxMAXLNG ) err = sal_True, nl = SbxMAXLNG; - else - if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG; + else if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG; if( nr > SbxMAXLNG ) err = sal_True, nr = SbxMAXLNG; - else - if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG; + else if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG; ll = (long) nl; lr = (long) nr; llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); @@ -431,8 +429,7 @@ void SbiExprNode::FoldConstants() // Integer operation! sal_Bool err = sal_False; if( nVal > SbxMAXLNG ) err = sal_True, nVal = SbxMAXLNG; - else - if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG; + else if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG; if( err ) { pGen->GetParser()->Error( SbERR_MATH_OVERFLOW ); diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 6b8f6a9bf7c6..50c13c703151 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -73,8 +73,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) if( eType == GRAPHIC_BITMAP ) nType = 1; - else - if( eType != GRAPHIC_NONE ) + else if( eType != GRAPHIC_NONE ) nType = 2; pVar->PutInteger( nType ); diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index f9784e442f65..19784f4ec900 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -435,8 +435,7 @@ bool ImpConvStringExt( OUString& rSrc, SbxDataType eTargetType ) aNewString = OUString::valueOf( (sal_Int32)SbxTRUE ); bChanged = true; } - else - if( rSrc.equalsIgnoreAsciiCase("false") ) + else if( rSrc.equalsIgnoreAsciiCase("false") ) { aNewString = OUString::valueOf( (sal_Int32)SbxFALSE ); bChanged = true; |