INTEGRATION: CWS sb82 (1.6.38); FILE MERGED

2007/11/08 10:13:09 sb 1.6.38.1: #i83412# Avoid warnings about switch cases that are not valid enum values (wntmsci11).

6 files changed, 28 insertions, 28 deletions

diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index b1d0793701a2..0ba7be195773 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxchar.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:28:35 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:21:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@ xub_Unicode ImpGetChar( const SbxValues* p )
     SbxValues aTmp;
     xub_Unicode nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -242,7 +242,7 @@ void ImpPutChar( SbxValues* p, xub_Unicode n )
 {
     SbxValues aTmp;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxCHAR:
             p->nChar = n; break;
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 60cb47ba462c..27ddb106168d 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxdbl.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:29:34 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:22:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,7 @@
 double ImpGetDouble( const SbxValues* p )
 {
     double nRes;
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -146,7 +146,7 @@ void ImpPutDouble( SbxValues* p, double n, BOOL bCoreString )
 {
     SbxValues aTmp;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         // Hier sind Tests notwendig
         case SbxCHAR:
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 266eb6119e05..c86e24e3c995 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxint.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:30:50 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:23:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@ INT16 ImpGetInteger( const SbxValues* p )
     SbxValues aTmp;
     INT16 nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -241,7 +241,7 @@ void ImpPutInteger( SbxValues* p, INT16 n )
 {
     SbxValues aTmp;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         // hier muss getestet werden
         case SbxCHAR:
@@ -411,7 +411,7 @@ sal_Int64 ImpGetInt64( const SbxValues* p )
     SbxValues aTmp;
     sal_Int64 nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -544,7 +544,7 @@ void ImpPutInt64( SbxValues* p, sal_Int64 n )
     SbxValues aTmp;
 
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         // Check neccessary
         case SbxCHAR:
@@ -701,7 +701,7 @@ sal_uInt64 ImpGetUInt64( const SbxValues* p )
     SbxValues aTmp;
     sal_uInt64 nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -849,7 +849,7 @@ void ImpPutUInt64( SbxValues* p, sal_uInt64 n )
     SbxValues aTmp;
 
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         // Check neccessary
         case SbxCHAR:
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 502286456685..5fa58cf73dd1 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxsng.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:32:01 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:23:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,7 +47,7 @@ float ImpGetSingle( const SbxValues* p )
     SbxValues aTmp;
     float nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -200,7 +200,7 @@ void ImpPutSingle( SbxValues* p, float n )
 {
     SbxValues aTmp;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxCHAR:
             aTmp.pChar = &p->nChar; goto direct;
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index e36b08356194..a28ac19de281 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxstr.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:32:17 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:24:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -58,7 +58,7 @@ XubString ImpGetString( const SbxValues* p )
     XubString aRes;
     aTmp.eType = SbxSTRING;
     aTmp.pString = &aRes;
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -173,7 +173,7 @@ void ImpPutString( SbxValues* p, const XubString* n )
     if( !n )
         n = pTmp = new XubString;
     aTmp.pString = (XubString*) n;
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxCHAR:
             p->nChar = ImpGetChar( &aTmp ); break;
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 6b89023b97c6..421e42a2240a 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxuint.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 14:32:32 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 15:24:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,7 +47,7 @@ UINT16 ImpGetUShort( const SbxValues* p )
     SbxValues aTmp;
     UINT16 nRes;
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxNULL:
             SbxBase::SetError( SbxERR_CONVERSION );
@@ -239,7 +239,7 @@ void ImpPutUShort( SbxValues* p, UINT16 n )
     SbxValues aTmp;
 
 start:
-    switch( p->eType )
+    switch( +p->eType )
     {
         case SbxERROR:
         case SbxUSHORT: