CWS-TOOLING: integrate CWS cmcfixes49

24 files changed, 88 insertions, 86 deletions

diff --git a/svx/inc/gallery1.hxx b/svx/inc/gallery1.hxx
index e50332c9af..68f3a27a1e 100644
--- a/svx/inc/gallery1.hxx
+++ b/svx/inc/gallery1.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: gallery1.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -158,7 +158,7 @@ public:
 
     SVX_DLLPUBLIC static Gallery* GetGalleryInstance();
                                 
-    const ULONG					GetThemeCount() const { return aThemeList.Count(); }
+    ULONG					GetThemeCount() const { return aThemeList.Count(); }
     const GalleryThemeEntry*	GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); }
     const GalleryThemeEntry*	GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
     
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 4b576773e4..0deef6233c 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: galtheme.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -127,7 +127,7 @@ public:
 
     static GalleryThemeEntry*	CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly );
 
-    const ULONG					GetObjectCount() const { return aObjectList.Count(); }
+    ULONG					GetObjectCount() const { return aObjectList.Count(); }
 
     SgaObject*					AcquireObject( ULONG nPos );
     void						ReleaseObject( SgaObject* pObj );
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
index c931b2a1d2..70541df263 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/hlnkitem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hlnkitem.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,7 +101,7 @@ public:
     const SvxMacroTableDtor* GetMacroTbl() const	{ return pMacroTable; }
 
     void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; }
-    const   USHORT GetMacroEvents() const { return nMacroEvents; }
+    USHORT GetMacroEvents() const { return nMacroEvents; }
 
     virtual SvStream&			Store( SvStream &, USHORT nItemVersion ) const;
     virtual SfxPoolItem*		Create( SvStream &, USHORT nVer ) const;
diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx
index 1d53cedc64..30fd5ea1a7 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/svx/inc/svx/brkitem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: brkitem.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,7 +83,7 @@ public:
     // MS VC4.0 kommt durcheinander
     void			 SetValue( USHORT nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
-    const SvxBreak			 GetBreak() const { return SvxBreak( GetValue() ); }
+    SvxBreak			 GetBreak() const { return SvxBreak( GetValue() ); }
     void					 SetBreak( const SvxBreak eNew )
                                 { SetValue( (USHORT)eNew ); }
 };
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 80d3b4b07d..3b3e90c601 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: deflt3d.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -94,11 +94,11 @@ public:
     
     const B3dMaterial& GetDefaultBackMaterial() { return aDefaultBackMaterial; }
     void SetDefaultBackMaterial(const B3dMaterial& rNew) { aDefaultBackMaterial = rNew; }
-    const BOOL GetDefaultCreateNormals() { return bDefaultCreateNormals; }
+    BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
     void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; }
-    const BOOL GetDefaultCreateTexture() { return bDefaultCreateTexture; }
+    BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
     void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
-    const BOOL GetDefaultUseDifferentBackMaterial() { return bDefaultUseDifferentBackMaterial; }
+    BOOL GetDefaultUseDifferentBackMaterial() const { return bDefaultUseDifferentBackMaterial; }
     void SetDefaultUseDifferentBackMaterial(const BOOL bNew) { bDefaultUseDifferentBackMaterial = bNew; }
 
     // Cube-Objekt
@@ -106,9 +106,9 @@ public:
     void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
     const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
     void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
-    const UINT16 GetDefaultCubeSideFlags() { return nDefaultCubeSideFlags; }
+    UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
     void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; }
-    const BOOL GetDefaultCubePosIsCenter() { return bDefaultCubePosIsCenter; }
+    BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
     void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
 
     // Sphere-Objekt
@@ -118,33 +118,33 @@ public:
     void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; }
 
     // Lathe-Objekt
-    const long GetDefaultLatheEndAngle() { return nDefaultLatheEndAngle; }
+    long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
     void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
-    const BOOL GetDefaultLatheSmoothed() { return bDefaultLatheSmoothed; }
+    BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
     void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; }
-    const BOOL GetDefaultLatheSmoothFrontBack() { return bDefaultLatheSmoothFrontBack; }
+    BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
     void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; }
-    const BOOL GetDefaultLatheCharacterMode() { return bDefaultLatheCharacterMode; }
+    BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
     void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; }
-    const BOOL GetDefaultLatheCloseFront() { return bDefaultLatheCloseFront; }
+    BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
     void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; }
-    const BOOL GetDefaultLatheCloseBack() { return bDefaultLatheCloseBack; }
+    BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
     void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
 
     // Extrude-Objekt
-    const BOOL GetDefaultExtrudeSmoothed() { return bDefaultExtrudeSmoothed; }
+    BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
     void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
-    const BOOL GetDefaultExtrudeSmoothFrontBack() { return bDefaultExtrudeSmoothFrontBack; }
+    BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
     void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
-    const BOOL GetDefaultExtrudeCharacterMode() { return bDefaultExtrudeCharacterMode; }
+    BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
     void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; }
-    const BOOL GetDefaultExtrudeCloseFront() { return bDefaultExtrudeCloseFront; }
+    BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
     void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; }
-    const BOOL GetDefaultExtrudeCloseBack() { return bDefaultExtrudeCloseBack; }
+    BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
     void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; }
 
     // Scene-Objekt
-    const BOOL GetDefaultDither() { return bDefaultDither; }
+    BOOL GetDefaultDither() const { return bDefaultDither; }
     void SetDefaultDither(const BOOL bNew) { bDefaultDither = bNew; }
 };
 
diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx
index c21f1a02ce..b99411663d 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/svx/inc/svx/lspcitem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: lspcitem.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -107,7 +107,7 @@ public:
     }
 
     // Vergroessert oder verkleinert die Zeilenhoehe.
-    const BYTE GetPropLineSpace() const { return nPropLineSpace; }
+    BYTE GetPropLineSpace() const { return nPropLineSpace; }
     inline void SetPropLineSpace( const BYTE nProp )
     {
         nPropLineSpace = nProp;
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 8b27e3a086..1d196924bf 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdoashp.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.6.90.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -134,8 +134,8 @@ public:
     // #i37011#
     const SdrObject* GetSdrObjectFromCustomShape() const;
     const SdrObject* GetSdrObjectShadowFromCustomShape() const;
-    const sal_Bool GetTextBounds( Rectangle& rTextBound ) const;
-    const sal_Bool IsTextPath() const;
+    sal_Bool GetTextBounds( Rectangle& rTextBound ) const;
+    sal_Bool IsTextPath() const;
     static SVX_DLLPRIVATE basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed );
 
 protected:
@@ -144,15 +144,15 @@ protected:
 
 public:
 
-    const sal_Bool UseNoFillStyle() const;
+    sal_Bool UseNoFillStyle() const;
 
-    const sal_Bool IsMirroredX() const;
-    const sal_Bool IsMirroredY() const;
+    sal_Bool IsMirroredX() const;
+    sal_Bool IsMirroredY() const;
     void SetMirroredX( const sal_Bool bMirroredX );
     void SetMirroredY( const sal_Bool bMirroredY );
 
-    const double GetObjectRotation() const;
-    const double GetExtraTextRotation() const;
+    double GetObjectRotation() const;
+    double GetExtraTextRotation() const;
 
     TYPEINFO();
     SdrObjCustomShape();
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index c42febf764..b46bb01a0b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: EnhancedCustomShapeGeometry.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.92.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -5565,7 +5565,7 @@ static const sal_uInt16 mso_DefaultFillingTable[] =
 {
     0x0000, 0x0018, 0x01ff, 0x0000, 0x0c00, 0x01e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
 };
-const sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType )
+sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType )
 {
     sal_Bool bIsFilledByDefault = sal_True;
     sal_uInt32 i = (sal_uInt32)eSpType;
@@ -5573,7 +5573,7 @@ const sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType )
         bIsFilledByDefault = ( mso_DefaultFillingTable[ i >> 4 ] & ( 1 << ( i & 0xf ) ) ) == 0;
     return bIsFilledByDefault;
 }
-const sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType )
+sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType )
 {
     sal_Int16 nGluePointType = com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS;
     const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
@@ -5610,7 +5610,7 @@ static const sal_uInt16 mso_DefaultStrokingTable[] =
     0x0000, 0x0000, 0x0000, 0x0000
 };
 // #i28269#
-const sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType )
+sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType )
 {
     sal_Bool bIsStrokedByDefault = sal_True;
     sal_uInt32 i = (sal_uInt32)eSpType;
@@ -5623,7 +5623,7 @@ static const sal_uInt16 msoSortFilledObjectsToBackTable[] =
 {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
-const sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType )
+sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType )
 {
     sal_Bool bSortFilledObjectsToBackByDefault = sal_True;
     sal_uInt32 i = (sal_uInt32)eSpType;
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
index 2bfa8bfe8a..30e5bb4e7c 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: EnhancedCustomShapeGeometry.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -92,12 +92,12 @@ struct mso_CustomShape
 
 #define MSO_I | (sal_Int32)0x80000000
 
-const sal_Bool			SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
-const sal_Bool			IsCustomShapeFilledByDefault( MSO_SPT eSpType );
-const sal_Int16			GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
+sal_Bool			SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
+sal_Bool			IsCustomShapeFilledByDefault( MSO_SPT eSpType );
+sal_Int16			GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
 
 // #i28269# 
-const sal_Bool			IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
+sal_Bool			IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
 
 const mso_CustomShape*	GetCustomShapeContent( MSO_SPT eSpType );
 
diff --git a/svx/source/dialog/cfg.cxx b/svx/source/dialog/cfg.cxx
index 91393aca2b..d47faed6e4 100644
--- a/svx/source/dialog/cfg.cxx
+++ b/svx/source/dialog/cfg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cfg.cxx,v $
- * $Revision: 1.50 $
+ * $Revision: 1.50.84.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2376,7 +2376,7 @@ bool SvxConfigPage::MoveEntryData(
             SvxEntries::const_iterator end = pEntries->end();
 
             // advance the iterator to the position of the target entry
-            while (*iter != pTargetData && ++iter != end);
+            while (*iter != pTargetData && ++iter != end) ;
 
             // insert the source entry at the position after the target
             pEntries->insert( ++iter, pSourceData );
@@ -3042,8 +3042,8 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
         SvxEntries::const_iterator end = GetEntries()->end();
 
         // Advance the iterators to the positions of the source and target
-        while (*iter1 != pSourceData && ++iter1 != end);
-        while (*iter2 != pTargetData && ++iter2 != end);
+        while (*iter1 != pSourceData && ++iter1 != end) ;
+        while (*iter2 != pTargetData && ++iter2 != end) ;
 
         // Now swap the entries in the menu list and in the UI
         if ( iter1 != end && iter2 != end )
diff --git a/svx/source/dialog/cuihyperdlg.hxx b/svx/source/dialog/cuihyperdlg.hxx
index 39a1c6bc36..fcd733aca5 100644
--- a/svx/source/dialog/cuihyperdlg.hxx
+++ b/svx/source/dialog/cuihyperdlg.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cuihyperdlg.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -107,7 +107,7 @@ public:
     USHORT					SetPage( SvxHyperlinkItem* pItem );
     void					EnableInetBrowse( sal_Bool bEnable = sal_True );
     void					SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
-    inline const BOOL		IsHTMLDoc() const { return mbIsHTMLDoc; }
+    inline BOOL		IsHTMLDoc() const { return mbIsHTMLDoc; }
 
     inline SfxBindings*		GetBindings() const { return mpBindings; };
     inline SfxDispatcher*	GetDispatcher() const { return mpBindings->GetDispatcher(); }
diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx
index d0b4796fdb..c66d42f033 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/svx/source/dialog/hangulhanja.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hangulhanja.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.102.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -317,7 +317,9 @@ namespace svx
                  m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED  && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL)
             m_eConvType = HHC::eConvSimplifiedTraditional;
         else
+        {
             DBG_ERROR( "failed to determine conversion type from languages" );
+        }
 
         // set remaining conversion parameters to their default values
         m_nConvOptions		= _nOptions;
diff --git a/svx/source/dialog/hlmarkwn.cxx b/svx/source/dialog/hlmarkwn.cxx
index 3ece0ee8d5..e65fbb228d 100644
--- a/svx/source/dialog/hlmarkwn.cxx
+++ b/svx/source/dialog/hlmarkwn.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hlmarkwn.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -186,7 +186,7 @@ USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError)
 |*
 |************************************************************************/
 
-const BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
+BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
 {
     if ( !mbUserMoved )
     {
@@ -206,7 +206,7 @@ void SvxHlinkDlgMarkWnd::Move ()
         mbUserMoved = TRUE;
 }
 
-const BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit )
+BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit )
 {
     BOOL bOldStatus = mbUserMoved;
 
diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/dialog/hltpbase.cxx
index 32ee609f7d..e17a4eae4f 100644
--- a/svx/source/dialog/hltpbase.cxx
+++ b/svx/source/dialog/hltpbase.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hltpbase.cxx,v $
- * $Revision: 1.37 $
+ * $Revision: 1.37.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -539,7 +539,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus()
 |*
 |************************************************************************/
 
-const BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const
+BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const
 {
     return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc();
 }
diff --git a/svx/source/dialog/hltpbase.hxx b/svx/source/dialog/hltpbase.hxx
index 6b09deb911..6702f9985d 100644
--- a/svx/source/dialog/hltpbase.hxx
+++ b/svx/source/dialog/hltpbase.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hltpbase.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -212,7 +212,7 @@ protected:
     USHORT             GetMacroEvents();
     SvxMacroTableDtor* GetMacroTable();
 
-    const BOOL IsHTMLDoc() const;
+    BOOL IsHTMLDoc() const;
 };
 
 #endif // _SVX_TABBASE_HYPERLINK_HXX
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6aea709563..5202efc024 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2719,7 +2719,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
             const USHORT nIdx = GetDragAryPos()+TAB_GAP;
             pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos;
             pRuler_Imp->SetPercSize(nTabCount);
-            for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0);
+            for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
             for(USHORT i = nIdx+1; i < nTabCount; ++i)
             {
                 const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index f119fb0fc6..d10eb15a23 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: filtnav.cxx,v $
- * $Revision: 1.48 $
+ * $Revision: 1.48.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1535,7 +1535,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 }
 
 //------------------------------------------------------------------------
-SvLBoxEntry* FmFilterNavigator::FindEntry(FmFilterData* pItem)
+SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 {
     SvLBoxEntry* pEntry = NULL;
     if (pItem)
@@ -1553,7 +1553,7 @@ SvLBoxEntry* FmFilterNavigator::FindEntry(FmFilterData* pItem)
 //------------------------------------------------------------------------
 void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos)
 {
-    FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
+    const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
 
     // insert the item
     SvLBoxEntry* pParentEntry = FindEntry(pParent);
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index cb29ae2312..13998e3beb 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: filtnav.hxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -273,7 +273,7 @@ public:
     virtual ~FmFilterNavigator();
 
     void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xCurrent);
-    FmFilterModel* const GetFilterModel() const {return m_pModel;}
+    const FmFilterModel* GetFilterModel() const {return m_pModel;}
 
 protected:
     using Control::Notify;
@@ -292,7 +292,7 @@ protected:
 
     void DeleteSelection();
     void Clear();
-    SvLBoxEntry* FindEntry(FmFilterData* pItem);
+    SvLBoxEntry* FindEntry(const FmFilterData* pItem) const;
     void Insert(FmFilterData* pItem, sal_Int32 nPos);
     void Remove(FmFilterData* pItem);
 
diff --git a/svx/source/inc/hlmarkwn.hxx b/svx/source/inc/hlmarkwn.hxx
index d02ef3cc3d..1f861c6781 100644
--- a/svx/source/inc/hlmarkwn.hxx
+++ b/svx/source/inc/hlmarkwn.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hlmarkwn.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,11 +101,11 @@ public:
     SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
     ~SvxHlinkDlgMarkWnd();
 
-    const BOOL MoveTo ( Point aNewPos );
+    BOOL MoveTo ( Point aNewPos );
     void RefreshTree ( String aStrURL );
     void SelectEntry ( String aStrMark );
 
-    const BOOL ConnectToDialog( BOOL bDoit = TRUE );
+    BOOL ConnectToDialog( BOOL bDoit = TRUE );
 
     USHORT SetError( USHORT nError);
 };
diff --git a/svx/source/items/svxfont.cxx b/svx/source/items/svxfont.cxx
index 0a7da63464..98c911c8a8 100644
--- a/svx/source/items/svxfont.cxx
+++ b/svx/source/items/svxfont.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svxfont.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -231,8 +231,8 @@ public:
 
     inline OutputDevice *GetOut() { return pOut; }
     inline const XubString &GetTxt() const { return rTxt; }
-    inline const xub_StrLen GetIdx() const { return nIdx; }
-    inline const xub_StrLen GetLen() const { return nLen; }
+    xub_StrLen GetIdx() const { return nIdx; }
+    xub_StrLen GetLen() const { return nLen; }
 };
 
 void SvxDoCapitals::DoSpace( const BOOL /*bDraw*/ ) { }
diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx
index b392b03912..4eeeda8171 100644
--- a/svx/source/msfilter/escherex.cxx
+++ b/svx/source/msfilter/escherex.cxx
@@ -3568,7 +3568,7 @@ EscherGraphicProvider::EscherGraphicProvider( sal_uInt32 nFlags ) :
 
 EscherGraphicProvider::~EscherGraphicProvider()
 {
-    for ( UINT32 i = 0; i < mnBlibEntrys; delete mpBlibEntrys[ i++ ] );
+    for ( UINT32 i = 0; i < mnBlibEntrys; delete mpBlibEntrys[ i++ ] ) ;
     delete[] mpBlibEntrys;
 }
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index cbbee7dbcc..199d566005 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdoashp.cxx,v $
- * $Revision: 1.52 $
+ * $Revision: 1.51.52.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -420,7 +420,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
     return mpLastShadowGeometry;
 }
 
-const sal_Bool SdrObjCustomShape::IsTextPath() const
+sal_Bool SdrObjCustomShape::IsTextPath() const
 {
     const rtl::OUString	sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
     sal_Bool bTextPathOn = sal_False;
@@ -431,7 +431,7 @@ const sal_Bool SdrObjCustomShape::IsTextPath() const
     return bTextPathOn;
 }
 
-const sal_Bool SdrObjCustomShape::UseNoFillStyle() const
+sal_Bool SdrObjCustomShape::UseNoFillStyle() const
 {
     sal_Bool bRet = sal_False;
     rtl::OUString sShapeType;
@@ -445,7 +445,7 @@ const sal_Bool SdrObjCustomShape::UseNoFillStyle() const
     return bRet;
 }
 
-const sal_Bool SdrObjCustomShape::IsMirroredX() const
+sal_Bool SdrObjCustomShape::IsMirroredX() const
 {
     sal_Bool bMirroredX = sal_False;
     SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
@@ -455,7 +455,7 @@ const sal_Bool SdrObjCustomShape::IsMirroredX() const
         *pAny >>= bMirroredX;
     return bMirroredX;
 }
-const sal_Bool SdrObjCustomShape::IsMirroredY() const
+sal_Bool SdrObjCustomShape::IsMirroredY() const
 {
     sal_Bool bMirroredY = sal_False;
     SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
@@ -488,12 +488,12 @@ void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY )
     SetMergedItem( aGeometryItem );
 }
 
-const double SdrObjCustomShape::GetObjectRotation() const
+double SdrObjCustomShape::GetObjectRotation() const
 {
     return fObjectRotation;
 }
 
-const double SdrObjCustomShape::GetExtraTextRotation() const
+double SdrObjCustomShape::GetExtraTextRotation() const
 {
     const com::sun::star::uno::Any* pAny;
     SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
@@ -504,7 +504,7 @@ const double SdrObjCustomShape::GetExtraTextRotation() const
         *pAny >>= fExtraTextRotateAngle;
     return fExtraTextRotateAngle;
 }
-const sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
+sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
 {
     sal_Bool bRet = sal_False;
     Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( this ) );	// a candidate for being cached
diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx
index c22a8c5815..5bd443c418 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/svx/source/svrtf/svxrtf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svxrtf.cxx,v $
- * $Revision: 1.34 $
+ * $Revision: 1.34.216.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
 SV_IMPL_PTRARR( SvxRTFColorTbl, ColorPtr )
 SV_IMPL_PTRARR( SvxRTFItemStackList, SvxRTFItemStackType* )
 
-const CharSet lcl_GetDefaultTextEncodingForRTF()
+CharSet lcl_GetDefaultTextEncodingForRTF()
 {
 
     ::com::sun::star::lang::Locale aLocale;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index f920829e03..612482ae9e 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoprov.cxx,v $
- * $Revision: 1.72 $
+ * $Revision: 1.72.92.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -938,7 +938,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger )
 
 SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 {
-    for(UINT16 i=0;i<SVXMAP_END;aMapArr[i++]=NULL);
+    for(UINT16 i=0;i<SVXMAP_END;aMapArr[i++]=NULL) ;
 }
 
 // ---------------------------------------------------------------------