summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 13:32:10 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 13:32:10 +0000
commit3eaeb5a275cd6f2b9ba9e6f447f6277c3d2e7cdd (patch)
tree5bd391500ad1ea1d5c283d8b8546e789cc208756 /basic
parent9e22a4e6b76a8d910b96e7055e6d5d4be2a3a226 (diff)
INTEGRATION: CWS sb59 (1.3.116); FILE MERGED
2006/08/11 15:04:31 sb 1.3.116.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'basic')
-rw-r--r--basic/source/sbx/sbxbool.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index ef67d2d46597..cba87eed9924 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sbxbool.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 10:08:09 $
+ * last change: $Author: obo $ $Date: 2006-10-12 14:32:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -48,9 +48,9 @@
using namespace rtl;
#endif
-INT16 ImpGetBool( const SbxValues* p )
+enum SbxBOOL ImpGetBool( const SbxValues* p )
{
- INT16 nRes;
+ enum SbxBOOL nRes;
switch( p->eType )
{
case SbxNULL:
@@ -128,10 +128,10 @@ INT16 ImpGetBool( const SbxValues* p )
{
SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
if( pVal )
- nRes = pVal->GetBool();
+ nRes = pVal->GetBool() ? SbxTRUE : SbxFALSE;
else
{
- SbxBase::SetError( SbxERR_NO_OBJECT ); nRes = 0;
+ SbxBase::SetError( SbxERR_NO_OBJECT ); nRes = SbxFALSE;
}
break;
}
@@ -166,7 +166,7 @@ INT16 ImpGetBool( const SbxValues* p )
nRes = !!*p->pLong64 ? SbxTRUE : SbxFALSE; break;
default:
- SbxBase::SetError( SbxERR_CONVERSION ); nRes = 0;
+ SbxBase::SetError( SbxERR_CONVERSION ); nRes = SbxFALSE;
}
return nRes;
}