INTEGRATION: CWS reportdesign01 (1.5.154); FILE MERGED

2007/10/04 09:03:57 lla 1.5.154.1: #i67655# only updates on some tests to build warning free

2 files changed, 29 insertions, 28 deletions

diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 52abe7666cfd..725fba717ee2 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sockethelper.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 08:54:22 $
+ *  last change: $Author: ihi $ $Date: 2007-11-20 19:36:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -250,7 +250,7 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen
         {
             tmpBuffer[nCharCounter] = '\0';
             nCharCounter = 0;
-            bsByteSequence[nByteSeqCounter++] = atoi( tmpBuffer );
+            bsByteSequence[nByteSeqCounter++] = static_cast<sal_Int8>(atoi( tmpBuffer ));
         }
         pChar++;
     }
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index fd1ae8685073..d1f00b3f1e6e 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: bootstrap_process.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 08:54:47 $
+ *  last change: $Author: ihi $ $Date: 2007-11-20 19:37:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,17 +59,18 @@ using namespace ::rtl;
 // ----------------------------------- Main -----------------------------------
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-        Bootstrap aBootstrap;
-        //custom .ini/rc file
-        Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) );
+    (void)argc;
+    Bootstrap aBootstrap;
+    //custom .ini/rc file
+    Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) );
     OUString suValue;
     OUString suDefault( OUString::createFromAscii("mydefault") );
-        int flag = atoi( argv[1] );
+    int flag = atoi( argv[1] );
 
-        switch( flag ) {
-       case 1:
+    switch( flag ) {
+    case 1:
         // parameters may be passed by command line arguments
-            aBootstrap.getFrom(
+        aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")),
             suValue );
         if (suValue.equalsAscii("service.rdb") )
@@ -78,9 +79,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 11;
-              case 2:
-                  // parameters may be passed by ini file
-            aBootstrap.getFrom(
+    case 2:
+        // parameters may be passed by ini file
+        aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
         if (suValue.equalsAscii("true") )
@@ -89,9 +90,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 21;
-              case 3:
-              // parameters may be passed by command line arguments
-            aBootstrap.getFrom(
+    case 3:
+        // parameters may be passed by command line arguments
+        aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")),
             suValue );
         if (suValue.equalsAscii("sun&ms") )
@@ -100,9 +101,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 31;
-       case 4:
-              // parameters may be passed by custom .ini/rc file
-            aBs_custom.getFrom(
+    case 4:
+        // parameters may be passed by custom .ini/rc file
+        aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")),
             suValue );
         if (suValue.equalsAscii("qadev17") )
@@ -111,9 +112,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 41;
-       case 5:
-              // parameters may be passed by inheritance
-            aBs_custom.getFrom(
+    case 5:
+        // parameters may be passed by inheritance
+        aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
         if (suValue.equalsAscii("true") )
@@ -122,9 +123,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 51;
-       default:
-             // parameters may be passed by inheritance
-            aBs_custom.getFrom(
+    default:
+        // parameters may be passed by inheritance
+        aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")),
             suValue, suDefault );
         if (suValue.equalsAscii("mydefault") )
@@ -133,5 +134,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else
             return 61;
-       }
+    }
 }