diff options
Diffstat (limited to 'basic/source/sbx/sbxvalue.cxx')
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 4779a85443..dc54d11c1d 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: sbxvalue.cxx,v $ - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * @@ -1573,9 +1570,9 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const { aL.eType = aR.eType = SbxDOUBLE; //if( Get( aL ) && rOp.Get( aR ) ) - bool bGetL = Get( aL );
- bool bGetR = rOp.Get( aR );
- if( bGetL && bGetR )
+ bool bGetL = Get( aL ); + bool bGetR = rOp.Get( aR ); + if( bGetL && bGetR ) switch( eOp ) { case SbxEQ: @@ -1593,17 +1590,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const default: SetError( SbxERR_NOTIMP ); } - // at least one value was got
- // if this is VBA then a conversion error for one
- // side will yield a false result of an equality test
- else if ( bGetR || bGetL )
- {
- if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
- {
- ResetError();
- bRes = FALSE;
- }
- }
+ // at least one value was got + // if this is VBA then a conversion error for one + // side will yield a false result of an equality test + else if ( bGetR || bGetL ) + { + if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION ) + { + ResetError(); + bRes = FALSE; + } + } } } if( eOld != SbxERR_OK ) |