CWS-TOOLING: integrate CWS cmcfixes49

5 files changed, 13 insertions, 14 deletions

diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index f986eaa45f..364d4daafc 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DIndexIter.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -175,13 +175,13 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
         switch (ePredicateType)
         {
             case SQLFilterOperator::NOT_EQUAL:
-                while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand));
+                while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ;
                 break;
             case SQLFilterOperator::LESS:
-                while ( ( ( pKey = GetNextKey() ) != NULL ) && pKey->getValue().isNull());
+                while ( ( ( pKey = GetNextKey() ) != NULL ) && pKey->getValue().isNull()) ;
                 break;
             case SQLFilterOperator::LESS_EQUAL:
-                while ( ( pKey = GetNextKey() ) != NULL );
+                while ( ( pKey = GetNextKey() ) != NULL ) ;
                 break;
             case SQLFilterOperator::GREATER_EQUAL:
             case SQLFilterOperator::EQUAL:
@@ -190,7 +190,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
             case SQLFilterOperator::GREATER:
                 pKey = GetFirstKey(m_aRoot,*m_pOperand);
                 if ( !pKey )
-                    while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand));
+                    while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ;
         }
     }
     else
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 5a9bb83d2b..26088267f6 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dindexnode.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -214,7 +214,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
                 else  // Position unbekannt
                 {
                     USHORT nPos = NODE_NOTFOUND;
-                    while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey());
+                    while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
 
                     --nCount;	// (sonst bekomme ich u.U. Assertions und GPFs - 60593)
                     bResult = Insert(nPos, rNode);
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index f63b1d7c35..bc11ee5395 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -230,7 +230,6 @@ sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url )
             OSL_ASSERT( hStdout );
             sal_Char  pBuffer[256];
             sal_uInt64  nBytesRead;
-            OSL_ASSERT( pBuffer );
             oslFileError nFileErr = osl_File_E_None;
             nFileErr = osl_readFile( hStdout, pBuffer, 256, &nBytesRead);
             if ( nFileErr != osl_File_E_None )
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index eeff056f1a..7027252134 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MNSMozabProxy.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -319,7 +319,7 @@ MNSMozabProxy::testLDAPConnection( )
         {
             const MLDAPMessageListener* pListener( static_cast< const MLDAPMessageListener* >( m_Args->arg5 ) );
             if ( pListener->initialized() )
-                rv = pListener->goodConnection() ? 0 : PR_NOT_CONNECTED_ERROR;
+                rv = pListener->goodConnection() ? 0 : (nsresult)PR_NOT_CONNECTED_ERROR;
             else
                 rv = (nsresult)PR_CONNECT_TIMEOUT_ERROR;
         }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index c5a54f1da4..3d4eed7314 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MQuery.hxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -111,9 +111,9 @@ namespace connectivity
             {
             }
 
-            const ::rtl::OUString&    getName()  { return m_aName; }
-            const MQueryOp::cond_type getCond()  { return m_aBooleanCondition; }
-            const ::rtl::OUString&    getValue() { return m_aValue; }
+            const ::rtl::OUString&    getName() const { return m_aName; }
+            MQueryOp::cond_type getCond() const { return m_aBooleanCondition; }
+            const ::rtl::OUString&    getValue() const { return m_aValue; }
         };
 
         class MQuery;