CWS-TOOLING: integrate CWS cmcfixes49

7 files changed, 32 insertions, 32 deletions

diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx
index ebce5f079774..cf76571a81de 100644
--- a/automation/source/inc/testapp.hxx
+++ b/automation/source/inc/testapp.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: testapp.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -122,7 +122,7 @@ public:
 
 private:
     ImplTestToolObj *pImpl;     // Alles was von der Implementation abh�ngt
-    static CErrors* const GetFehlerListe() { return pFehlerListe; }
+    static const CErrors* GetFehlerListe() { return pFehlerListe; }
     BOOL bUseIPC;
     Link aLogHdl;               // Zum Logen der Fehlermeldungen im Testtool
     Link aWinInfoHdl;           // Anzeigen der Windows/Controls der zu testenden App
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 4ee712e1f2c2..babe0e428440 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: testapp.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -147,7 +147,7 @@ void MainWindow::SysDlg()
     switch (QueryBox(this,WB_YES_NO_CANCEL | WB_DEF_YES, CUniString("Want to open another Dialog?")).Execute())
       {
           case RET_YES:
-            while ( WarningBox(this,WB_OK_CANCEL | WB_DEF_OK,CUniString("Well this is the last box now!")).Execute() == RET_OK );
+            while ( WarningBox(this,WB_OK_CANCEL | WB_DEF_OK,CUniString("Well this is the last box now!")).Execute() == RET_OK ) ;
               break;
           case RET_NO:
               break;
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 2a8713747c37..fb12de2f1b8d 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: plaintextformatter.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -132,10 +132,10 @@ namespace logging
     ::rtl::OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException)
     {
         char buffer[ 30 ];
-        const size_t buffer_size = sizeof( buffer );
-        size_t used = snprintf( buffer, buffer_size, "%10i", (int)_rRecord.SequenceNumber );
-        if ( used >= buffer_size )
-            buffer[ buffer_size ] = 0;
+        const int buffer_size = sizeof( buffer );
+        int used = snprintf( buffer, buffer_size, "%10i", (int)_rRecord.SequenceNumber );
+        if ( used >= buffer_size || used < 0 )
+            buffer[ buffer_size - 1 ] = 0;
 
         ::rtl::OUStringBuffer aLogEntry;
         aLogEntry.appendAscii( buffer );
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 7e0cc5e44eac..a20a915a6cc3 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sane.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.16.60.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -118,7 +118,7 @@ SANE_Status     (*Sane::p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
 void            (*Sane::p_cancel)( SANE_Handle ) = 0;
 SANE_Status     (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
 SANE_Status     (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
-const SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
+SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
 
 static BOOL bSaneSymbolLoadFailed = FALSE;
 
@@ -237,7 +237,7 @@ void Sane::Init()
             LoadSymbol( "sane_set_io_mode" );
         p_get_select_fd = (SANE_Status(*)(SANE_Handle, SANE_Int*))
             LoadSymbol( "sane_get_select_fd" );
-        p_strstatus = (const SANE_String_Const(*)(SANE_Status))
+        p_strstatus = (SANE_String_Const(*)(SANE_Status))
             LoadSymbol( "sane_strstatus" );
         if( bSaneSymbolLoadFailed )
             DeInit();
@@ -248,7 +248,7 @@ void Sane::Init()
             nStatus = p_get_devices( (const SANE_Device***)&ppDevices,
                                      SANE_FALSE );
             FAIL_SHUTDOWN_STATE( nStatus, "sane_get_devices", );
-            for( nDevices = 0 ; ppDevices[ nDevices ]; nDevices++ );
+            for( nDevices = 0 ; ppDevices[ nDevices ]; nDevices++ ) ;
         }
     }
 #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 9e3664794644..7b6ed63caee5 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sane.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.64.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -97,7 +97,7 @@ private:
     static void             (*p_cancel)( SANE_Handle );
     static SANE_Status      (*p_set_io_mode)( SANE_Handle, SANE_Bool );
     static SANE_Status      (*p_get_select_fd)( SANE_Handle, SANE_Int* );
-    static const SANE_String_Const (*p_strstatus)( SANE_Status );
+    static SANE_String_Const (*p_strstatus)( SANE_Status );
 
     static SANE_Int             nVersion;
     static SANE_Device**        ppDevices;
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 65b062ad60f3..93d7b83c95ff 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ZipPackage.hxx,v $
- * $Revision: 1.41 $
+ * $Revision: 1.41.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -117,7 +117,7 @@ public:
     virtual ~ZipPackage( void );
     ZipFile& getZipFile() { return *pZipFile;}
     const com::sun::star::uno::Sequence < sal_Int8 > & getEncryptionKey ( ) {return aEncryptionKey;}
-    const sal_Int16 getFormat() { return m_nFormat; }
+    sal_Int16 getFormat() const { return m_nFormat; }
 
     // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index 535c5ec5d94b..e0a2129c6519 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ZipPackageStream.hxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -79,29 +79,29 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& GetOwnSeekStream();
 
 public:
-    sal_Bool HasOwnKey ()        { return bHaveOwnKey;}
-    sal_Bool IsToBeCompressed () { return bToBeCompressed;}
-    sal_Bool IsToBeEncrypted ()  { return bToBeEncrypted;}
-    sal_Bool IsEncrypted ()      { return bIsEncrypted;}
-    sal_Bool IsPackageMember ()  { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
+    sal_Bool HasOwnKey () const  { return bHaveOwnKey;}
+    sal_Bool IsToBeCompressed () const { return bToBeCompressed;}
+    sal_Bool IsToBeEncrypted () const { return bToBeEncrypted;}
+    sal_Bool IsEncrypted () const    { return bIsEncrypted;}
+    sal_Bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
     vos::ORef < EncryptionData > & getEncryptionData ()
     { return xEncryptionData;}
-    const com::sun::star::uno::Sequence < sal_Int8 >& getKey ()
+    const com::sun::star::uno::Sequence < sal_Int8 >& getKey () const
     { return xEncryptionData->aKey;}
-    const com::sun::star::uno::Sequence < sal_uInt8 >& getInitialisationVector ()
+    const com::sun::star::uno::Sequence < sal_uInt8 >& getInitialisationVector () const
     { return xEncryptionData->aInitVector;}
-    const com::sun::star::uno::Sequence < sal_uInt8 >& getDigest ()
+    const com::sun::star::uno::Sequence < sal_uInt8 >& getDigest () const
     { return xEncryptionData->aDigest;}
-    const com::sun::star::uno::Sequence < sal_uInt8 >& getSalt ()
+    const com::sun::star::uno::Sequence < sal_uInt8 >& getSalt () const
     { return xEncryptionData->aSalt;}
-    const sal_Int32 getIterationCount ()
+    sal_Int32 getIterationCount () const
     { return xEncryptionData->nIterationCount;}
-    const sal_Int32 getSize ()
+    sal_Int32 getSize () const
     { return aEntry.nSize;}
 
-    sal_uInt8 GetStreamMode() { return m_nStreamMode; }
-    sal_uInt32 GetMagicalHackPos() { return m_nMagicalHackPos; }
-    sal_uInt32 GetMagicalHackSize() { return m_nMagicalHackSize; }
+    sal_uInt8 GetStreamMode() const { return m_nStreamMode; }
+    sal_uInt32 GetMagicalHackPos() const { return m_nMagicalHackPos; }
+    sal_uInt32 GetMagicalHackSize() const { return m_nMagicalHackSize; }
 
     void SetToBeCompressed (sal_Bool bNewValue) { bToBeCompressed = bNewValue;}
     void SetIsEncrypted (sal_Bool bNewValue) { bIsEncrypted = bNewValue;}