CWS-TOOLING: integrate CWS cmcfixes49

8 files changed, 18 insertions, 18 deletions

diff --git a/vcl/source/gdi/fontcfg.cxx b/vcl/source/gdi/fontcfg.cxx
index 17e3d91cb36c..68d3b499341d 100644
--- a/vcl/source/gdi/fontcfg.cxx
+++ b/vcl/source/gdi/fontcfg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fontcfg.cxx,v $
- * $Revision: 1.49 $
+ * $Revision: 1.49.114.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -772,7 +772,7 @@ static bool ImplKillTrailingWithExceptions( String& rName, const char* const* pp
         else
         {
             // skip exception strings
-            while( *++ppStr );
+            while( *++ppStr ) ;
         }
     }
 
diff --git a/vcl/source/gdi/implncvt.cxx b/vcl/source/gdi/implncvt.cxx
index a81d0c7142fa..9b570b539221 100644
--- a/vcl/source/gdi/implncvt.cxx
+++ b/vcl/source/gdi/implncvt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: implncvt.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,8 +61,8 @@ struct ImplFloatPoint
     void            operator+=( const ImplFloatPoint& rPoint ) { fX += rPoint.fX; fY += rPoint.fY; }
     void            operator-=( const ImplFloatPoint& rPoint ) { fX -= rPoint.fX; fY -= rPoint.fY; }
     void            operator*=( const double& rD ) { fX *= rD; fY *= rD; }
-    BOOL            operator==( const ImplFloatPoint& rPoint ) const { return ( ( rPoint.fX == fX ) && ( rPoint.fY == fY ) ); } const
-    void            operator=( const Point rPoint ) { fX = rPoint.X(); fY = rPoint.Y(); }
+    BOOL            operator==( const ImplFloatPoint& rPoint ) const { return ( ( rPoint.fX == fX ) && ( rPoint.fY == fY ) ); }
+    void            operator=( const Point& rPoint ) { fX = rPoint.X(); fY = rPoint.Y(); }
 
     ImplFloatPoint  GetOVec( const ImplFloatPoint& rPoint ) const;
     ImplFloatPoint  GetNVec( const ImplFloatPoint& rPoint ) const;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 063a886e4fa5..cb5357fb6a3e 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -843,7 +843,7 @@ void OutputDevice::RemoveFontSubstitute( USHORT n )
 void ImplDirectFontSubstitution::RemoveFontSubstitute( int nIndex )
 {
     FontSubstList::iterator it = maFontSubstList.begin();
-    for( int nCount = 0; (it != maFontSubstList.end()) && (nCount++ != nIndex); ++it );
+    for( int nCount = 0; (it != maFontSubstList.end()) && (nCount++ != nIndex); ++it ) ;
     if( it != maFontSubstList.end() )
         maFontSubstList.erase( it );
 }
@@ -877,8 +877,8 @@ bool ImplDirectFontSubstitution::GetFontSubstitute( int nIndex,
     String& rFontName, String& rSubstFontName, USHORT& rFlags ) const
 {
     FontSubstList::const_iterator it = maFontSubstList.begin();
-    for( int nCount = 0; nCount++ != nIndex; ++it );
-        if( it == maFontSubstList.end() )
+    for( int nCount = 0; (it != maFontSubstList.end()) && (nCount++ != nIndex); ++it ) ;
+    if( it == maFontSubstList.end() )
         return false;
 
     const ImplFontSubstEntry* pEntry = &(*it);
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 50fb72002428..56c9025018b9 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: pngread.cxx,v $
- * $Revision: 1.28 $
+ * $Revision: 1.28.78.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -328,7 +328,7 @@ bool PNGReaderImpl::ReadNextChunk()
 // read the remaining chunks from mrPNGStream
 void PNGReaderImpl::ReadRemainingChunks()
 {
-    while( ReadNextChunk() );
+    while( ReadNextChunk() ) ;
 }
 
 // ------------------------------------------------------------------------
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index b3ad4b332ec7..6bc5bb5b44c9 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -1711,13 +1711,13 @@ ULONG FreetypeServerFont::GetFontCodeRanges( sal_uInt32* pCodes ) const
             // we have to use the brute force method...
             for( sal_uInt32 cCode = 0x0020;; )
             {
-                for(; cCode<0xFFF0 && !GetGlyphIndex( cCode ); ++cCode );
+                for(; cCode<0xFFF0 && !GetGlyphIndex( cCode ); ++cCode ) ;
                 if( cCode >= 0xFFF0 )
                     break;
                 ++aResult.mnPairCount;
                 if( pCodes )
                     *(pCodes++) = cCode;
-                for(; cCode<0xFFF0 && GetGlyphIndex( cCode ); ++cCode );
+                for(; cCode<0xFFF0 && GetGlyphIndex( cCode ); ++cCode ) ;
                 if( pCodes )
                     *(pCodes++) = cCode;
             }
diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx
index 93a7cb1bd7a9..9cba5332f281 100755
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: gcach_rbmp.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.114.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -117,7 +117,7 @@ static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2,
         // store left aligned remainder if needed
         if( nTemp > 1 )
         {
-            for(; nTemp < 0x100U; nTemp += nTemp );
+            for(; nTemp < 0x100U; nTemp += nTemp ) ;
             *(p1++) = (unsigned char)nTemp;
         }
         // pad scanline with zeroes
@@ -162,7 +162,7 @@ static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2,
         // store left aligned remainder if needed
         if( nTemp > 1 )
         {
-            for(; nTemp < 0x100; nTemp += nTemp );
+            for(; nTemp < 0x100; nTemp += nTemp ) ;
             *(p1++) = (unsigned char)nTemp;
         }
         // scanline pad is already clean
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index ce13d3313d4f..0f9e21052c50 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: saldata.cxx,v $
- * $Revision: 1.58 $
+ * $Revision: 1.58.98.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -649,7 +649,7 @@ void SalXLib::Remove( int nFD )
     {
         for ( nFD = nFDs_ - 1;
               nFD >= 0 && !yieldTable[nFD].fd;
-              nFD-- );
+              nFD-- ) ;
 
         nFDs_ = nFD + 1;
     }
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 60acda82091e..8eff0b5d4588 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1300,7 +1300,7 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
             typedef std::pair<VerticalTrapSet::iterator, VerticalTrapSet::iterator> VTSPair;
             VTSPair aVTSPair = aVerticalTraps.equal_range( *aActiveTrapsIt );
             VerticalTrapSet::iterator aVTSit = aVTSPair.first;
-            for(; (aVTSit != aVTSPair.second) && (*aVTSit != *aActiveTrapsIt); ++aVTSit );
+            for(; (aVTSit != aVTSPair.second) && (*aVTSit != *aActiveTrapsIt); ++aVTSit ) ;
             if( aVTSit != aVTSPair.second )
                 aVerticalTraps.erase( aVTSit );
             // then update the old trapezoid's bottom