CWS-TOOLING: integrate CWS cmcfixes49

57 files changed, 151 insertions, 150 deletions

diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index 02503dd09305..1f2c63eae46f 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: bitmapdevice.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.14.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -125,7 +125,7 @@ public:
 
         This is just a frontend for getPalette->size()
      */
-    const sal_Int32 getPaletteEntryCount() const;
+    sal_Int32 getPaletteEntryCount() const;
 
     /** Clear whole device with given color
 
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 34599a5ef3be..22157b1e0e4d 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: bitmapdevice.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.33.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1093,7 +1093,7 @@ PaletteMemorySharedVector BitmapDevice::getPalette() const
     return mpImpl->mpPalette;
 }
 
-const sal_Int32 BitmapDevice::getPaletteEntryCount() const
+sal_Int32 BitmapDevice::getPaletteEntryCount() const
 {
     return mpImpl->mpPalette ? mpImpl->mpPalette->size() : 0;
 }
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 3c4a57b46185..7baca88bf28a 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hommatrixtemplate.hxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.18.12.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -587,7 +587,7 @@ namespace basegfx
                 testLastLine();
             }
 
-            bool isEqual(const ImplHomMatrixTemplate& rMat)
+            bool isEqual(const ImplHomMatrixTemplate& rMat) const
             {
                 const sal_uInt16 nMaxLine(
                     sal::static_int_cast<sal_uInt16>((mpLine || rMat.mpLine) ? RowSize : (RowSize - 1)) );
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; }
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 58f3ee12fd5f..301dac5622fd 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xdictionary.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -164,13 +164,13 @@ sal_Bool SAL_CALL xdictionary::seekSegment(const sal_Unicode *text, sal_Int32 po
         for (segBoundary.startPos = pos - 1;
             segBoundary.startPos >= 0 &&
                 (u_isWhitespace((sal_uInt32)text[segBoundary.startPos]) || exists(text[segBoundary.startPos]));
-            segBoundary.startPos--);
+            segBoundary.startPos--) ;
         segBoundary.startPos++;
 
         for (segBoundary.endPos = pos;
             segBoundary.endPos < len &&
                     (u_isWhitespace((sal_uInt32)text[segBoundary.endPos]) || exists(text[segBoundary.endPos]));
-            segBoundary.endPos++);
+            segBoundary.endPos++) ;
 
         return segBoundary.endPos > segBoundary.startPos + 1;
 }
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 7037b2750d46..0472795887d7 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: chaptercollator.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -73,8 +73,8 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
         return CollatorImpl::compareSubstring( str1, off1,  len1, str2, off2, len2 );
 
     sal_Int32 i1, i2;
-    for (i1 = len1; i1 && (cclass->getCharacterType(str1, off1+i1-1, nLocale) & DIGIT); i1--);
-    for (i2 = len2; i2 && (cclass->getCharacterType(str2, off2+i2-1, nLocale) & DIGIT); i2--);
+    for (i1 = len1; i1 && (cclass->getCharacterType(str1, off1+i1-1, nLocale) & DIGIT); i1--) ;
+    for (i2 = len2; i2 && (cclass->getCharacterType(str2, off2+i2-1, nLocale) & DIGIT); i2--) ;
 
     sal_Int32 ans = CollatorImpl::compareSubstring(str1, off1, i1, str2, off2, i2);
     if( ans != 0 )
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 1b036e418741..09fc96e18002 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: indexentrysupplier_default.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -226,7 +226,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
             case sal_Unicode('('):
                 if (key_count > 0) {
                     sal_Int16 end = i+1;
-                    for (end=i+1; end < len && keyStr[end] != close; end++);
+                    for (end=i+1; end < len && keyStr[end] != close; end++) ;
 
                     if (end >= len) // no found
                         throw RuntimeException();
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 5a53dcd8ed2e..fd1806610236 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LocaleNode.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -127,7 +127,7 @@ public:
     inline const OUString& getName() const { return aName; };
     inline const OUString& getValue() const { return aValue; };
     inline const Attr* getAttr() const { return xAttribs; };
-    inline const sal_Int32 getNumberOfChildren () const { return nChildren; };
+    inline sal_Int32 getNumberOfChildren () const { return nChildren; };
     inline  LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx] ; };
     const LocaleNode * findNode ( const sal_Char *name) const;
     void print () const;
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e8001913e048..c0ec98f646aa 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -614,7 +614,7 @@ LocaleData::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException)
 
 // return a static (!) string resulting from replacing all occurrences of
 // 'oldStr' string in 'formatCode' string with 'newStr' string
-static sal_Unicode const * const replace( sal_Unicode const * const formatCode, sal_Unicode const * const oldStr, sal_Unicode const * const newStr)
+static const sal_Unicode * replace( sal_Unicode const * const formatCode, sal_Unicode const * const oldStr, sal_Unicode const * const newStr)
 {
 // make reasonable assumption of maximum length of formatCode.
 #define MAX_FORMATCODE_LENTH 512
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 134a1ff5eda5..23a264603df9 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: genconv_dict.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -178,7 +178,7 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
     // create function to return arrays
     fprintf (cfp, "\tconst sal_Unicode* getHangul2HanjaData() { return Hangul2HanjaData; }\n");
     fprintf (cfp, "\tconst com::sun::star::i18n::Hangul_Index* getHangul2HanjaIndex() { return Hangul2HanjaIndex; }\n");
-    fprintf (cfp, "\tconst sal_Int16 getHangul2HanjaIndexCount() { return sizeof(Hangul2HanjaIndex) / sizeof(com::sun::star::i18n::Hangul_Index); }\n");
+    fprintf (cfp, "\tsal_Int16 getHangul2HanjaIndexCount() { return sizeof(Hangul2HanjaIndex) / sizeof(com::sun::star::i18n::Hangul_Index); }\n");
     fprintf (cfp, "\tconst sal_uInt16* getHanja2HangulIndex() { return Hanja2HangulIndex; }\n");
     fprintf (cfp, "\tconst sal_Unicode* getHanja2HangulData() { return Hanja2HangulData; }\n");
 }
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index bf3d81ad52b8..04710a1c6d0d 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textconversion_ko.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -133,7 +133,7 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos
     Sequence< OUString > output;
     const sal_Unicode* (*getHangul2HanjaData)() = (const sal_Unicode* (*)())getFunctionBySymbol("getHangul2HanjaData");
     const Hangul_Index* (*getHangul2HanjaIndex)() = (const Hangul_Index* (*)()) getFunctionBySymbol("getHangul2HanjaIndex");
-    const sal_Int16 (*getHangul2HanjaIndexCount)() = (const sal_Int16 (*)()) getFunctionBySymbol("getHangul2HanjaIndexCount");
+    sal_Int16 (*getHangul2HanjaIndexCount)() = (sal_Int16 (*)()) getFunctionBySymbol("getHangul2HanjaIndexCount");
     const sal_uInt16* (*getHanja2HangulIndex)() = (const sal_uInt16* (*)()) getFunctionBySymbol("getHanja2HangulIndex");
     const sal_Unicode* (*getHanja2HangulData)() = (const sal_Unicode* (*)()) getFunctionBySymbol("getHanja2HangulData");
     if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && getHangul2HanjaData) {
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 53929cc6d20e..12b8561f7dfe 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textconversion_zh.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -187,7 +187,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
                         bottom = current + 1;
                     else {
                         if (toSChinese)   // Traditionary/Simplified conversion,
-                            for (current = entry[current]-1; current > 0 && wordData[current-1]; current--);
+                            for (current = entry[current]-1; current > 0 && wordData[current-1]; current--) ;
                         else  // Simplified/Traditionary conversion, forwards search for next word
                             current = entry[current] + word.getLength() + 1;
                         sal_Int32 start=current;
diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/o3tl/inc/o3tl/cow_wrapper.hxx
index b7b3c5b9480a..9b281e3967bf 100644
--- a/o3tl/inc/o3tl/cow_wrapper.hxx
+++ b/o3tl/inc/o3tl/cow_wrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cow_wrapper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -205,6 +205,7 @@ void cow_wrapper_client::queryUnmodified() const
     public:
         typedef T        value_type;
         typedef T*       pointer;
+        typedef const T* const_pointer;
         typedef MTPolicy mt_policy;
 
         /** Default-construct wrapped type instance
@@ -278,11 +279,11 @@ void cow_wrapper_client::queryUnmodified() const
 
         pointer           operator->()       { return &make_unique(); }
         value_type&       operator*()        { return make_unique(); }
-        const pointer     operator->() const { return &m_pimpl->m_value; }
+        const_pointer     operator->() const { return &m_pimpl->m_value; }
         const value_type& operator*()  const { return m_pimpl->m_value; }
 
         pointer           get()       { return &make_unique(); }
-        const pointer     get() const { return &m_pimpl->m_value; }
+        const_pointer     get() const { return &m_pimpl->m_value; }
 
         /// true, if both cow_wrapper internally share the same object
         bool              same_object( const cow_wrapper& rOther ) const
diff --git a/psprint/inc/psprint/ppdparser.hxx b/psprint/inc/psprint/ppdparser.hxx
index 3cd63f7af74f..baea44ebaf25 100644
--- a/psprint/inc/psprint/ppdparser.hxx
+++ b/psprint/inc/psprint/ppdparser.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ppdparser.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -222,7 +222,7 @@ public:
     ULONG           getLanguageLevel() const { return m_nLanguageLevel; }
 
     const String&   getDefaultPaperDimension() const;
-    const void      getDefaultPaperDimension( int& rWidth, int& rHeight ) const
+    void            getDefaultPaperDimension( int& rWidth, int& rHeight ) const
     { getPaperDimension( getDefaultPaperDimension(), rWidth, rHeight ); }
     bool getPaperDimension( const String& rPaperName,
                             int& rWidth, int& rHeight ) const;
diff --git a/psprint/inc/psprint/printergfx.hxx b/psprint/inc/psprint/printergfx.hxx
index 30c141fb1a88..55816330fa48 100644
--- a/psprint/inc/psprint/printergfx.hxx
+++ b/psprint/inc/psprint/printergfx.hxx
@@ -52,7 +52,7 @@ class PrinterColor
 {
 public:
 
-    typedef enum    ColorSpace { eInvalid, eRGB };
+    enum    ColorSpace { eInvalid, eRGB };
 
 private:
 
diff --git a/psprint/source/fontmanager/parseAFM.cxx b/psprint/source/fontmanager/parseAFM.cxx
index 2d8a7817df52..480b4217503a 100644
--- a/psprint/source/fontmanager/parseAFM.cxx
+++ b/psprint/source/fontmanager/parseAFM.cxx
@@ -314,7 +314,7 @@ static char *linetoken( FileInputStream* stream )
     static char ident[MAX_NAME]; /* storage buffer for keywords */
     int ch, idx;
 
-    while ((ch = stream->getChar()) == ' ' || ch == '\t' );
+    while ((ch = stream->getChar()) == ' ' || ch == '\t' ) ;
 
     idx = 0;
     while (ch != -1 && ch != lineterm && ch != '\r' && idx < MAX_NAME-1 )
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index b5f7ed0c3ac4..8ce58cd56c48 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: rscdef.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.14.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -741,7 +741,7 @@ RscFile :: ~RscFile(){
     //von hinten nach vorne ist besser wegen der Abhaengigkeiten
     //Objekte zerstoeren sich, wenn Referenzzaehler NULL
     aDefLst.Last();
-    while( aDefLst.Remove() );
+    while( aDefLst.Remove() ) ;
 }
 
 /*************************************************************************
@@ -1318,7 +1318,7 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){
             aDefTree.Remove( pDef );
             pDef = pFName->aDefLst.Next();
         };
-        while( pFName->aDefLst.Remove( (ULONG)0 ) );
+        while( pFName->aDefLst.Remove( (ULONG)0 ) ) ;
     }
 }
 
diff --git a/svtools/inc/svtools/ctypeitm.hxx b/svtools/inc/svtools/ctypeitm.hxx
index 191ae467b634..2592c6e0f388 100644
--- a/svtools/inc/svtools/ctypeitm.hxx
+++ b/svtools/inc/svtools/ctypeitm.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ctypeitm.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -76,7 +76,7 @@ public:
     virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
                              BYTE nMemberId = 0);
 
-    const INetContentType GetEnumValue() const;
+    INetContentType GetEnumValue() const;
 
     void                  SetValue( const INetContentType eType );
 };
diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx
index d1cca69a950a..2e570dfe2550 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/sychconv.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sychconv.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,7 +44,7 @@ class SymCharConverter
 {
 public:
 
-    static const BOOL   Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
+    static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL );
 };
 
 #endif // _CHARCONV_HXX
diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx
index d30fb24c6d78..e8507722e31b 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/unoevent.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoevent.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -282,7 +282,7 @@ public:
 
 protected:
 
-    sal_Int16 getIndex(const sal_uInt16 nID);
+    sal_Int16 getIndex(const sal_uInt16 nID) const;
 
     using SvBaseEventDescriptor::replaceByName;
     virtual void replaceByName(
@@ -308,8 +308,8 @@ protected:
     /// return sal_False: no macro; getByName() will return an empty macro
     /// IllegalArgumentException: the event is not supported
     using SvBaseEventDescriptor::hasByName;
-    virtual const sal_Bool hasByName(
-        const sal_uInt16 nEvent )       /// item ID of event
+    virtual sal_Bool hasByName(
+        const sal_uInt16 nEvent ) const     /// item ID of event
              throw(
                 ::com::sun::star::lang::IllegalArgumentException);
 
diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index a9671f648785..0a394207d051 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sychconv.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +33,7 @@
 #include "sychconv.hxx"
 #include <vcl/outdev.hxx>
 
-const BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
+BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
 {
     // hibyte 0 = exact matching
     //        1 = little differences,
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index b5e5d6c69b7d..6f1caae18750 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: winmtf.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.54.136.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -310,7 +310,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 // ------------------------------------------------------------------------
 
 #ifdef WIN_MTF_ASSERT
-const void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
+void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
 {
     static sal_Bool     bOnlyOnce;
     static sal_Int32    nAssertCount;
@@ -573,7 +573,7 @@ Polygon& WinMtfOutput::ImplMap( Polygon& rPolygon )
 PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon )
 {
     UINT16 nPolys = rPolyPolygon.Count();
-    for ( UINT16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) );
+    for ( UINT16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) ) ;
     return rPolyPolygon;
 }
 
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 4b333b67e0c6..ada590a19675 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: winmtf.hxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.34.134.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -308,7 +308,7 @@ struct LOGFONTW
 #define WIN_MTF_ASSERT_ONCE     0x40000000
 #define WIN_MTF_ASSERT_MIFE     0x20000000
 
-const void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE );
+void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE );
 #endif
 
 enum WinMtfClipPathType{ EMPTY, RECTANGLE, COMPLEX };
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 9bc34210e780..490ddaa82d40 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: winwmf.cxx,v $
- * $Revision: 1.36 $
+ * $Revision: 1.36.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1085,7 +1085,7 @@ void WMFReader::ReadWMF()
 
 // ------------------------------------------------------------------------
 
-const static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
+static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
 {
     Point aSource( rSource );
     if ( nMapMode == MM_HIMETRIC )
@@ -1100,7 +1100,7 @@ const static void GetWinExtMax( const Point& rSource, Rectangle& rPlaceableBound
         rPlaceableBound.Bottom() = aSource.Y();
 }
 
-const static void GetWinExtMax( const Rectangle& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
+static void GetWinExtMax( const Rectangle& rSource, Rectangle& rPlaceableBound, const sal_Int16 nMapMode )
 {
     GetWinExtMax( rSource.TopLeft(), rPlaceableBound, nMapMode );
     GetWinExtMax( rSource.BottomRight(), rPlaceableBound, nMapMode );
diff --git a/svtools/source/items1/ctypeitm.cxx b/svtools/source/items1/ctypeitm.cxx
index 30eda4342219..552d4a6a9041 100644
--- a/svtools/source/items1/ctypeitm.cxx
+++ b/svtools/source/items1/ctypeitm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ctypeitm.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -200,7 +200,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation(
 }
 
 //----------------------------------------------------------------------------
-const INetContentType CntContentTypeItem::GetEnumValue() const
+INetContentType CntContentTypeItem::GetEnumValue() const
 {
     if ( _eType == CONTENT_TYPE_NOT_INIT )
     {
diff --git a/svtools/source/items1/frqitem.cxx b/svtools/source/items1/frqitem.cxx
index 7b2e9f4e2cbf..4068ef8f97f1 100644
--- a/svtools/source/items1/frqitem.cxx
+++ b/svtools/source/items1/frqitem.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: frqitem.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -533,7 +533,7 @@ DateTime SfxFrequencyItem::CalcNextTick( const DateTime& rBase, BOOL bFirst )
                 aDT.SetDay( 1 );
                 aDT += (long)(aNextDate.GetDaysInMonth() - 1);
                 if( aDT.GetDayOfWeek() != nDay )
-                    for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- );
+                    for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- ) ;
                 aNextDate = aDT;
             }
             else
diff --git a/svtools/source/items1/stylepool.cxx b/svtools/source/items1/stylepool.cxx
index 3aa8e7645919..5f31500be73c 100644
--- a/svtools/source/items1/stylepool.cxx
+++ b/svtools/source/items1/stylepool.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: stylepool.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.78.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -77,7 +77,7 @@ namespace {
         // <--
         ~Node();
         // --> OD 2008-03-11 #i86923#
-        const bool hasItemSet( const bool bCheckUsage ) const;
+        bool hasItemSet( const bool bCheckUsage ) const;
         // <--
         // --> OD 2008-04-29 #i87808#
 //        const StylePool::SfxItemSet_Pointer_t getItemSet() const { return aItemSet[aItemSet.size()-1]; }
@@ -121,7 +121,7 @@ namespace {
     // <--
 
     // --> OD 2008-05-06 #i86923#
-    const bool Node::hasItemSet( const bool bCheckUsage ) const
+    bool Node::hasItemSet( const bool bCheckUsage ) const
     {
         bool bHasItemSet = false;
 
diff --git a/svtools/source/misc/ownlist.cxx b/svtools/source/misc/ownlist.cxx
index 8a972595ad65..346b4ff7251e 100644
--- a/svtools/source/misc/ownlist.cxx
+++ b/svtools/source/misc/ownlist.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ownlist.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,7 +53,7 @@ static String parseString(const String & rCmd, USHORT * pIndex)
 
         USHORT begin = *pIndex;
 
-        while(*pIndex < rCmd.Len() && rCmd.GetChar((*pIndex) ++) != '\"');
+        while(*pIndex < rCmd.Len() && rCmd.GetChar((*pIndex) ++) != '\"') ;
 
         result = String(rCmd.Copy(begin, *pIndex - begin - 1));
     }
diff --git a/svtools/source/misc/urihelper.cxx b/svtools/source/misc/urihelper.cxx
index 970078b4ba6d..1ddb4c6dd6f9 100644
--- a/svtools/source/misc/urihelper.cxx
+++ b/svtools/source/misc/urihelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: urihelper.cxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.22.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -661,17 +661,17 @@ URIHelper::FindFirstURLInText(UniString const & rText,
                                                                      rEnd));
                 if (eScheme == INET_PROT_FILE) // 2nd
                 {
-                    while (rText.GetChar(i++) != ':');
+                    while (rText.GetChar(i++) != ':') ;
                     xub_StrLen nPrefixEnd = i;
                     xub_StrLen nUriEnd = i;
                     while (i != rEnd
                            && checkWChar(rCharClass, rText, &i, &nUriEnd, true,
-                                         true));
+                                         true)) ;
                     if (i != nPrefixEnd && rText.GetChar(i) == '#')
                     {
                         ++i;
                         while (i != rEnd
-                               && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                               && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     }
                     if (nUriEnd != nPrefixEnd
                         && isBoundary1(rCharClass, rText, nUriEnd, rEnd))
@@ -691,16 +691,16 @@ URIHelper::FindFirstURLInText(UniString const & rText,
                 }
                 else if (eScheme != INET_PROT_NOT_VALID) // 1st
                 {
-                    while (rText.GetChar(i++) != ':');
+                    while (rText.GetChar(i++) != ':') ;
                     xub_StrLen nPrefixEnd = i;
                     xub_StrLen nUriEnd = i;
                     while (i != rEnd
-                           && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                           && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     if (i != nPrefixEnd && rText.GetChar(i) == '#')
                     {
                         ++i;
                         while (i != rEnd
-                               && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                               && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     }
                     if (nUriEnd != nPrefixEnd
                         && (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
@@ -745,13 +745,13 @@ URIHelper::FindFirstURLInText(UniString const & rText,
                     {
                         nUriEnd = ++i;
                         while (i != rEnd
-                               && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                               && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     }
                     if (i != rEnd && rText.GetChar(i) == '#')
                     {
                         ++i;
                         while (i != rEnd
-                               && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                               && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     }
                     if (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
                         || rText.GetChar(nUriEnd) == '\\')
@@ -778,7 +778,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
                     i = nPos + 3;
                     xub_StrLen nUriEnd = i;
                     while (i != rEnd
-                           && checkWChar(rCharClass, rText, &i, &nUriEnd));
+                           && checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
                     if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
                     {
                         INetURLObject aUri(UniString(rText, nPos,
@@ -808,7 +808,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
                     xub_StrLen nUriEnd = ++i;
                     while (i != rEnd
                            && checkWChar(rCharClass, rText, &i, &nUriEnd,
-                                         true));
+                                         true)) ;
                     if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
                     {
                         INetURLObject aUri(UniString(rText, nPos,
diff --git a/svtools/source/misc1/strmadpt.cxx b/svtools/source/misc1/strmadpt.cxx
index b0823437db00..8686f1ab24c2 100644
--- a/svtools/source/misc1/strmadpt.cxx
+++ b/svtools/source/misc1/strmadpt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: strmadpt.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -971,7 +971,7 @@ bool SvDataPipe_Impl::removeMark(sal_uInt32 nPosition)
     if (t == m_aMarks.end())
         return false;
     m_aMarks.erase(t);
-    while (remove(m_pFirstPage));
+    while (remove(m_pFirstPage)) ;
     return true;
 }
 
diff --git a/svtools/source/numbers/zforscan.hxx b/svtools/source/numbers/zforscan.hxx
index 5dfecce61935..bc19ac5b633f 100644
--- a/svtools/source/numbers/zforscan.hxx
+++ b/svtools/source/numbers/zforscan.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: zforscan.hxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -137,11 +137,11 @@ public:
                                                 // Veraendert nur die Bool-Variable
                                                 // (zum temporaeren Unterbrechen des
                                                 // Convert-Modus)
-    const BOOL GetConvertMode()     { return bConvertMode; }
-    const LanguageType GetNewLnge() { return eNewLnge; }
+    BOOL GetConvertMode() const     { return bConvertMode; }
+    LanguageType GetNewLnge() const { return eNewLnge; }
                                                 // Lesezugriff auf ConvertMode
                                                 // und Konvertierungsland/Spr.
-    const LanguageType GetTmpLnge() { return eTmpLnge; }
+    LanguageType GetTmpLnge() const { return eTmpLnge; }
                                                 // Lesezugriff auf
                                                 // und Ausgangsland/Spr.
 
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index a3bb9e8fac84..14321ecdd84c 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoevent.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -495,7 +495,7 @@ SvDetachedEventDescriptor::~SvDetachedEventDescriptor()
     delete aMacros;
 }
 
-sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID)
+sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
 {
     // iterate over supported events
     sal_Int16 nIndex = 0;
@@ -548,8 +548,8 @@ void SvDetachedEventDescriptor::getByName(
         rMacro = (*aMacros[nIndex]);
 }
 
-const sal_Bool SvDetachedEventDescriptor::hasByName(
-    const sal_uInt16 nEvent )       /// item ID of event
+sal_Bool SvDetachedEventDescriptor::hasByName(
+    const sal_uInt16 nEvent ) const     /// item ID of event
         throw(IllegalArgumentException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
diff --git a/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx
index 18dcaa28a6fc..329e9d97c696 100644
--- a/tools/bootstrp/addexes2/mkfilt.cxx
+++ b/tools/bootstrp/addexes2/mkfilt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mkfilt.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.34.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -213,7 +213,7 @@ void MkFilter::Filter()
                 {
                     MkLine *pMkLine = pLine->pPrivateTnrLst->GetObject(i);
                     ByteString aLine = pMkLine->aLine;
-                    while( aLine.SearchAndReplace( aTnr, ByteString::CreateFromInt32( n )) != (USHORT)-1 );
+                    while( aLine.SearchAndReplace( aTnr, ByteString::CreateFromInt32( n )) != (USHORT)-1 ) ;
                     fputs( aLine.GetBuffer(), pOut );
                     fprintf( stderr, "o" );
                 }
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index f22a8282fff6..05e981b64a0e 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: command.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.40.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -440,7 +440,7 @@ void CCommand::ImplInit()
 }
 
 /*****************************************************************************/
-CCommand::operator const int()
+CCommand::operator int()
 /*****************************************************************************/
 {
     int nRet;
@@ -589,7 +589,7 @@ CCommandd::CCommandd( const char *pChar, CommandBits nBits )
 }
 
 /*****************************************************************************/
-CCommandd::operator const int()
+CCommandd::operator int()
 /*****************************************************************************/
 {
     int nRet = 0;
diff --git a/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx
index e6fded69348b..90b7f8ae26bf 100644
--- a/tools/bootstrp/inimgr.cxx
+++ b/tools/bootstrp/inimgr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: inimgr.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -110,14 +110,14 @@ ByteString IniManager::ToLocal( ByteString &rPath )
 
     sTmp.SearchAndReplace( sIni, sLocalPath );
 
-    while ( sTmp.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND );
+    while ( sTmp.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND ) ;
 #else
     sTmp.SearchAndReplace( sGlobalDir, sLocalPath );
 
     ByteString sOldGlobalDir( GetIniRootOld() );
     sTmp.SearchAndReplace( sOldGlobalDir, sLocalPath );
 
-    while ( sTmp.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND );
+    while ( sTmp.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND ) ;
 #endif
 
     return sTmp;
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index cb65a930a2f5..dfe86daac73e 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: prj.cxx,v $
- * $Revision: 1.29 $
+ * $Revision: 1.29.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -88,7 +88,7 @@ ByteString SimpleConfig::GetNext()
     ByteString aString;
 
     if ( aStringBuffer =="" )
-      while ((aStringBuffer = GetNextLine()) == "\t"); //solange bis != "\t"
+      while ((aStringBuffer = GetNextLine()) == "\t") ; //solange bis != "\t"
     if ( aStringBuffer =="" )
         return ByteString();
 
@@ -112,7 +112,7 @@ ByteString  SimpleConfig::GetNextLine()
         return "\t";
     aTmpStr = aTmpStr.EraseLeadingChars();
     aTmpStr = aTmpStr.EraseTrailingChars();
-    while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND );
+    while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND ) ;
     int nLength = aTmpStr.Len();
     BOOL bFound = FALSE;
     ByteString aEraseString;
diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx
index e80f07adbeba..3b481371908b 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/tools/inc/bootstrp/command.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: command.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.40.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -136,7 +136,7 @@ public:
                     /** Spawns the Process
                         @return 0 when spawned without errors, otherwise a error code
                     */
-    operator const  int();
+    operator int();
 
     ByteString          GetCommandLine_() { return aCommandLine; }
     ByteString          GetCommand() { return aCommand; }
@@ -162,7 +162,7 @@ class CCommandd : public CCommand
 public:
                     CCommandd( ByteString &rString, CommandBits nBits );
                     CCommandd( const char *pChar, CommandBits nBits );
-    operator const  int();
+    operator int();
 };
 
 #endif
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 2b74cf3fce80..8223d77106e3 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fsys.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -294,7 +294,7 @@ private:
 protected:
     void                ImpTrim( FSysPathStyle eStyle );
     const ByteString&   ImpTheName() const;
-    const DirEntryFlag  ImpTheFlag() const { return eFlag; };
+    DirEntryFlag        ImpTheFlag() const { return eFlag; };
     DirEntry*           ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE );
     DirEntry*           ImpGetParent() { return pParent; }
 #ifdef FEAT_FSYS_DOUBLESPEED
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 190f59262e17..f8c30ec21aa3 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: urlobj.cxx,v $
- * $Revision: 1.63 $
+ * $Revision: 1.63.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1571,7 +1571,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef,
         && getSchemeInfo().m_bHierarchical)
     {
         hasScheme = false;
-        while (p != pEnd && *p++ != ':');
+        while (p != pEnd && *p++ != ':') ;
     }
     rWasAbsolute = hasScheme;
 
diff --git a/transex3/source/gsicheck.hxx b/transex3/source/gsicheck.hxx
index ed3ac48757b7..13debcfc7106 100644
--- a/transex3/source/gsicheck.hxx
+++ b/transex3/source/gsicheck.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: gsicheck.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,8 +60,8 @@ private:
 
 public:
     GSILine( const ByteString &rLine, ULONG nLine );
-    LineFormat  const GetLineFormat() const    { return aFormat; }
-    ULONG       const GetLineNumber() const    { return nLineNumber; }
+    LineFormat  GetLineFormat() const    { return aFormat; }
+    ULONG       GetLineNumber() const    { return nLineNumber; }
 
     ByteString  const GetUniqId()     const    { return aUniqId; }
     ByteString  const GetLineType()   const    { return aLineType; }
@@ -79,10 +79,10 @@ public:
     ParserMessageList* GetMessageList() { return &aMessages; };
     BOOL HasMessages(){ return ( aMessages.Count() > 0 ); };
 
-    BOOL const IsOK() { return bOK; }
+    BOOL IsOK() const { return bOK; }
     void NotOK();
 
-    BOOL const IsFixed() { return bFixed; }
+    BOOL IsFixed() const { return bFixed; }
     void SetFixed() { bFixed = TRUE; };
 };
 
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index 384d9cdd8f87..be53bb9fd7ba 100755
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: simplecertificatevalidationrequest.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -73,7 +73,7 @@ public:
       * @return the continuation choosen by an interaction handler or
       *         CONTINUATION_UNKNOWN, if the request was not (yet) handled.
       */
-    const sal_Int32 getResponse() const;
+    sal_Int32 getResponse() const;
 };
 
 } // namespace ucbhelper
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
index 26e27de46243..a7dfb86f33da 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: simpleinteractionrequest.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -91,7 +91,7 @@ public:
       * @return the continuation choosen by an interaction handler or
       *         CONTINUATION_UNKNOWN, if the request was not (yet) handled.
       */
-    const sal_Int32 getResponse() const;
+    sal_Int32 getResponse() const;
 };
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index 0b53ce8d127a..975547031621 100755
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: simplecertificatevalidationrequest.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,7 +58,7 @@ SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sa
 }
 
 //=========================================================================
-const sal_Int32 SimpleCertificateValidationRequest::getResponse() const
+sal_Int32 SimpleCertificateValidationRequest::getResponse() const
 {
     rtl::Reference< InteractionContinuation > xSelection = getSelection();
     if ( xSelection.is() )
diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx
index 116409a6a25c..93fd33cc991f 100644
--- a/ucbhelper/source/provider/simpleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: simpleinteractionrequest.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -100,7 +100,7 @@ SimpleInteractionRequest::SimpleInteractionRequest(
 }
 
 //=========================================================================
-const sal_Int32 SimpleInteractionRequest::getResponse() const
+sal_Int32 SimpleInteractionRequest::getResponse() const
 {
     rtl::Reference< InteractionContinuation > xSelection = getSelection();
     if ( xSelection.is() )
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