CWS-TOOLING: integrate CWS cmcfixes49

6 files changed, 20 insertions, 20 deletions

diff --git a/goodies/inc/b3dtex.hxx b/goodies/inc/b3dtex.hxx
index ec58985d96e0..47207e359782 100644
--- a/goodies/inc/b3dtex.hxx
+++ b/goodies/inc/b3dtex.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: b3dtex.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -275,8 +275,8 @@ protected:
     virtual ~B3dTexture();
 
     // Interne Zugriffsfunktion auf die BitMapFarben
-    inline const BitmapColor GetBitmapColor(long nX, long nY);
-    inline const sal_uInt8 GetBitmapTransparency(long nX, long nY);
+    inline BitmapColor GetBitmapColor(long nX, long nY) const;
+    inline sal_uInt8 GetBitmapTransparency(long nX, long nY) const;
 
     // Generate switch val for optimized own texture mapping
     void SetSwitchVal();
diff --git a/goodies/inc/goodies/bucket.hxx b/goodies/inc/goodies/bucket.hxx
index 2ad55a568fca..93b58ca92e9d 100644
--- a/goodies/inc/goodies/bucket.hxx
+++ b/goodies/inc/goodies/bucket.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: bucket.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -112,7 +112,7 @@
     } \
     void TheClassName##TheExtension::InitializeSize(UINT16 TheSize) { \
         UINT16 nSiz; \
-        for(nShift=0,nSiz=1;nSiz<sizeof(TheClassName);nSiz<<=1,nShift++); \
+        for(nShift=0,nSiz=1;nSiz<sizeof(TheClassName);nSiz<<=1,nShift++) ; \
         nBlockShift = TheSize - nShift; \
         nMask = (1L << nBlockShift)-1L; \
         nSlotSize = 1<<nShift; \
diff --git a/goodies/source/base3d/b3dtex.cxx b/goodies/source/base3d/b3dtex.cxx
index 79908ca58682..67c678431f14 100644
--- a/goodies/source/base3d/b3dtex.cxx
+++ b/goodies/source/base3d/b3dtex.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: b3dtex.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -385,12 +385,12 @@ void B3dTexture::SetSwitchVal()
 |*
 \************************************************************************/
 
-const BitmapColor B3dTexture::GetBitmapColor(long nX, long nY)
+BitmapColor B3dTexture::GetBitmapColor(long nX, long nY) const
 {
     return pReadAccess->GetColor(nY, nX);
 }
 
-const sal_uInt8 B3dTexture::GetBitmapTransparency(long nX, long nY)
+sal_uInt8 B3dTexture::GetBitmapTransparency(long nX, long nY) const
 {
     if(pAlphaReadAccess)
         return pAlphaReadAccess->GetColor(nY, nX).GetIndex();
diff --git a/goodies/source/filter.vcl/eras/eras.cxx b/goodies/source/filter.vcl/eras/eras.cxx
index 9d04a27d6a02..46307f2a56e0 100644
--- a/goodies/source/filter.vcl/eras/eras.cxx
+++ b/goodies/source/filter.vcl/eras/eras.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: eras.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -184,9 +184,9 @@ void RASWriter::ImplWritePalette()
 {
     USHORT i;
 
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetRed() );
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetGreen() );
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetBlue() );
+    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetRed() ) ;
+    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetGreen() ) ;
+    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetBlue() ) ;
 }
 
 // ------------------------------------------------------------------------
diff --git a/goodies/source/filter.vcl/icgm/elements.cxx b/goodies/source/filter.vcl/icgm/elements.cxx
index f8b2e8a0fbac..7c5b99c43539 100644
--- a/goodies/source/filter.vcl/icgm/elements.cxx
+++ b/goodies/source/filter.vcl/icgm/elements.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: elements.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -200,12 +200,12 @@ void CGMElements::Init()
     eColorModel = CM_RGB;
     nColorMaximumIndex = 63;
     int i;
-    for ( i = 0; i < 256; aColorTableEntryIs[ i++ ] = 0 );
+    for ( i = 0; i < 256; aColorTableEntryIs[ i++ ] = 0 ) ;
     aColorTable[ 0 ] = 0;
-    for ( i = 1; i < 256; aColorTable[ i++ ] = 0xffffff );
+    for ( i = 1; i < 256; aColorTable[ i++ ] = 0xffffff ) ;
     nLatestColorMaximumIndex = 63;
     aLatestColorTable[ 0 ] = 0;
-    for ( i = 1; i < 256; aLatestColorTable[ i++ ] = 0xffffff );
+    for ( i = 1; i < 256; aLatestColorTable[ i++ ] = 0xffffff ) ;
     nColorValueExtent[ 0 ] = nColorValueExtent[ 1 ] = nColorValueExtent[ 2 ] = 0;
     nColorValueExtent[ 3 ] = nColorValueExtent[ 4 ] = nColorValueExtent[ 5 ] = 255;
 
diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx
index ffd2d056389d..fb7cb94a964c 100644
--- a/goodies/source/graphic/grfcache.cxx
+++ b/goodies/source/graphic/grfcache.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: grfcache.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -458,10 +458,10 @@ public:
 
     const GraphicAttr&          GetAttr() const { return maAttr; }
     const Size&                 GetOutputSizePixel() const { return maOutSizePix; }
-    const ULONG                 GetCacheSize() const { return mnCacheSize; }
+    ULONG                   GetCacheSize() const { return mnCacheSize; }
     const GraphicCacheEntry*    GetReferencedCacheEntry() const { return mpRefCacheEntry; }
-    const ULONG                 GetOutDevDrawMode() const { return mnOutDevDrawMode; }
-    const USHORT                GetOutDevBitCount() const { return mnOutDevBitCount; }
+    ULONG                   GetOutDevDrawMode() const { return mnOutDevDrawMode; }
+    USHORT              GetOutDevBitCount() const { return mnOutDevBitCount; }
 
     void                        SetReleaseTime( const ::vos::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; }
     const ::vos::TTimeValue&    GetReleaseTime() const { return maReleaseTime; }