CWS-TOOLING: integrate CWS cmcfixes49

32 files changed, 144 insertions, 144 deletions

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index e9a221fdcb2c..be8f95594c62 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: format.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.146.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -662,7 +662,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
 
     @return false, default implementation
 */
-const sal_Bool SwFmt::IsBackgroundTransparent() const
+sal_Bool SwFmt::IsBackgroundTransparent() const
 {
     return sal_False;
 }
@@ -678,7 +678,7 @@ const sal_Bool SwFmt::IsBackgroundTransparent() const
 
     @return false, default implementation
 */
-const sal_Bool SwFmt::IsShadowTransparent() const
+sal_Bool SwFmt::IsShadowTransparent() const
 {
     return sal_False;
 }
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 5012e079f5d2..16ec5c453469 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: number.cxx,v $
- * $Revision: 1.53 $
+ * $Revision: 1.53.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1240,7 +1240,7 @@ namespace numfunc
                 return msFontname;
             }
             // --> OD 2008-06-02 #i63395#
-            inline const bool IsFontnameUserDefined() const
+            inline bool IsFontnameUserDefined() const
             {
                 return mbUserDefinedFontname;
             }
@@ -1249,15 +1249,15 @@ namespace numfunc
             {
                 return *mpFont;
             }
-            inline const short GetFontWeight() const
+            inline short GetFontWeight() const
             {
                 return static_cast<short>(meFontWeight);
             }
-            inline const short GetFontItalic() const
+            inline short GetFontItalic() const
             {
                 return static_cast<short>(meFontItalic);
             }
-            inline const sal_Unicode GetChar( BYTE p_nListLevel ) const
+            inline sal_Unicode GetChar( BYTE p_nListLevel ) const
             {
                 if ( p_nListLevel > MAXLEVEL )
                 {
@@ -1476,7 +1476,7 @@ namespace numfunc
     }
 
     // --> OD 2008-06-02 #i63395#
-    const bool IsDefBulletFontUserDefined()
+    bool IsDefBulletFontUserDefined()
     {
         return SwDefBulletConfig::getInstance()->IsFontnameUserDefined();
     }
@@ -1487,7 +1487,7 @@ namespace numfunc
         return SwDefBulletConfig::getInstance()->GetFont();
     }
 
-    const sal_Unicode GetBulletChar( BYTE nLevel )
+    sal_Unicode GetBulletChar( BYTE nLevel )
     {
         return SwDefBulletConfig::getInstance()->GetChar( nLevel );
     }
@@ -1514,7 +1514,7 @@ namespace numfunc
                 return mpInstance;
             }
 
-            inline const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
+            inline sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
             {
                 return mbChangeIndentOnTabAtFirstPosOfFirstListItem;
             }
@@ -1618,13 +1618,13 @@ namespace numfunc
         LoadConfig();
     }
 
-    const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem()
+    sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem()
     {
         return SwNumberingUIBehaviorConfig::getInstance()->ChangeIndentOnTabAtFirstPosOfFirstListItem();
     }
 
     // --> OD 2008-06-06 #i89178#
-    const SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode()
+    SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode()
     {
         SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode;
         SvtSaveOptions aSaveOptions;
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 2d39d584bf08..fe15b7fabbfa 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ndnotxt.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -217,7 +217,7 @@ BOOL SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const
     return TRUE;
 }
 
-const BOOL SwNoTxtNode::IsPixelContour() const
+BOOL SwNoTxtNode::IsPixelContour() const
 {
     BOOL bRet;
     if( bContourMapModeValid )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b8a726a603ad..32598db202ae 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dcontact.cxx,v $
- * $Revision: 1.62 $
+ * $Revision: 1.61.210.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -212,7 +212,7 @@ SwContact::~SwContact()
 }
 
 // OD 05.09.2003 #112039# - accessor for member <mbInDTOR>
-const bool SwContact::IsInDTOR() const
+bool SwContact::IsInDTOR() const
 {
     return mbInDTOR;
 }
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 0fd419c648d9..9c5b57bab6d1 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: macrofld.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -107,7 +107,7 @@ String SwMacroField::GetLibName() const
         USHORT nPos = aMacro.Len();
 
         for (USHORT i = 0; i < 3 && nPos > 0; i++)
-            while (aMacro.GetChar(--nPos) != '.' && nPos > 0);
+            while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ;
 
         return aMacro.Copy(0, nPos );
     }
@@ -129,7 +129,7 @@ String SwMacroField::GetMacroName() const
             USHORT nPos = aMacro.Len();
 
             for (USHORT i = 0; i < 3 && nPos > 0; i++)
-                while (aMacro.GetChar(--nPos) != '.' && nPos > 0);
+                while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ;
 
             return aMacro.Copy( ++nPos );
         }
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 63093e79e9c4..f6539c26d16c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: feshview.cxx,v $
- * $Revision: 1.62 $
+ * $Revision: 1.61.136.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -3121,7 +3121,7 @@ const Color SwFEShell::GetShapeBackgrd() const
     @returns boolean, indicating, if the horizontal text direction of the
     page, the selected drawing object is on, is right-to-left.
 */
-const bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const
+bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const
 {
     bool bRet = false;
 
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index c33e1ad0d64b..87adedcf6c0d 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: anchoredobjectposition.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -126,7 +126,7 @@ namespace objectpositioning
                 return *mpFrmFmt;
             }
             // --> OD 2006-03-15 #i62875#
-            inline const bool DoesObjFollowsTextFlow() const
+            inline bool DoesObjFollowsTextFlow() const
             {
                 return mbFollowTextFlow;
             }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index c3a9356e4cfa..dc8975f3fd47 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: flyfrm.hxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -146,8 +146,8 @@ protected:
     virtual void RegisterAtCorrectPage();
 
     // --> OD 2006-08-10 #i68520#
-    virtual const bool _SetObjTop( const SwTwips _nTop );
-    virtual const bool _SetObjLeft( const SwTwips _nLeft );
+    virtual bool _SetObjTop( const SwTwips _nTop );
+    virtual bool _SetObjLeft( const SwTwips _nLeft );
     // <--
 
     // --> OD 2006-10-05 #i70122#
@@ -245,7 +245,7 @@ public:
         @return true, if background color is transparent or a existing background
         graphic is transparent.
     */
-    const sal_Bool IsBackgroundTransparent() const;
+    sal_Bool IsBackgroundTransparent() const;
 
     /** SwFlyFrm::IsShadowTransparent - for feature #99657#
 
@@ -257,7 +257,7 @@ public:
 
         @return true, if shadow color is transparent.
     */
-    const sal_Bool IsShadowTransparent() const;
+    sal_Bool IsShadowTransparent() const;
 
     // OD 2004-01-19 #110582#
     void Chain( SwFrm* _pAnchor );
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 53fff1777885..4c802f646b9a 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: objectformatter.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -110,7 +110,7 @@ class SwObjectFormatter
             return mrPageFrm;
         }
 
-        inline const bool ConsiderWrapOnObjPos() const
+        inline bool ConsiderWrapOnObjPos() const
         {
             return mbConsiderWrapOnObjPos;
         }
@@ -130,7 +130,7 @@ class SwObjectFormatter
             mbFormatOnlyAsCharAnchored = true;
         }
 
-        inline const bool FormatOnlyAsCharAnchored() const
+        inline bool FormatOnlyAsCharAnchored() const
         {
             return mbFormatOnlyAsCharAnchored;
         }
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index c35fbaf1bfc5..e992fb0fdf28 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: pagefrm.hxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.144.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -275,7 +275,7 @@ public:
     void SetFtnPage( BOOL b )                               { bFtnPage = b; }
     void SetEndNotePage( BOOL b )                           { bEndNotePage = b; }
 
-    inline  const USHORT GetPhyPageNum() const  { return nPhyPageNum;}
+    inline  USHORT GetPhyPageNum() const    { return nPhyPageNum;}
     inline  void SetPhyPageNum( USHORT nNum )   { nPhyPageNum = nNum;}
     inline  void DecrPhyPageNum()               { --nPhyPageNum;     }
     inline  void IncrPhyPageNum()               { ++nPhyPageNum;     }
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 5e1470d79f0a..4e7293d9b6d8 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: txtfrm.hxx,v $
- * $Revision: 1.56 $
+ * $Revision: 1.56.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -590,7 +590,7 @@ public:
     inline void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); };
 
     // OD 14.03.2003 #i11760# - access to new member <mbNoFollowFormat>
-    inline const bool FollowFormatAllowed() const
+    inline bool FollowFormatAllowed() const
     {
         return mbFollowFormatAllowed;
     }
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 6f225018f4c6..476990022ff2 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewimp.hxx,v $
- * $Revision: 1.36 $
+ * $Revision: 1.36.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -244,7 +244,7 @@ public:
     BOOL IsPaintInScroll() const { return bPaintInScroll; }
 
     // neues Interface fuer StarView Drawing
-    inline const BOOL HasDrawView() const { return 0 != pDrawView; }
+    inline BOOL HasDrawView() const { return 0 != pDrawView; }
           SwDrawView* GetDrawView()       { return pDrawView; }
     const SwDrawView* GetDrawView() const { return pDrawView; }
           SdrPageView*GetPageView()       { return pSdrPageView; }
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index c9681f73b07b..0976dcbefdc0 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: anchoreddrawobject.cxx,v $
- * $Revision: 1.26 $
+ * $Revision: 1.26.144.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -273,7 +273,7 @@ void SwAnchoredDrawObject::UpdateLayoutDir()
 // <--
 
 // --> OD 2006-03-17 #i62875#
-const bool SwAnchoredDrawObject::IsOutsidePage() const
+bool SwAnchoredDrawObject::IsOutsidePage() const
 {
     bool bOutsidePage( false );
 
@@ -712,14 +712,14 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 // <--
 
 // --> OD 2006-08-10 #i68520#
-const bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop )
+bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop )
 {
     SwTwips nDiff = _nTop - GetObjRect().Top();
     DrawObj()->Move( Size( 0, nDiff ) );
 
     return nDiff != 0;
 }
-const bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft )
+bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft )
 {
     SwTwips nDiff = _nLeft - GetObjRect().Left();
     DrawObj()->Move( Size( nDiff, 0 ) );
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index a99256f7673d..62048fbca378 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: anchoredobject.cxx,v $
- * $Revision: 1.27 $
+ * $Revision: 1.27.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -276,7 +276,7 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr
 // =============================================================================
 // accessors for member <mnLastTopOfLine>
 // =============================================================================
-const SwTwips SwAnchoredObject::GetLastTopOfLine() const
+SwTwips SwAnchoredObject::GetLastTopOfLine() const
 {
     return mnLastTopOfLine;
 }
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 1c3572acf948..9d433846f0ad 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: atrfrm.cxx,v $
- * $Revision: 1.72 $
+ * $Revision: 1.72.144.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2885,7 +2885,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
     @return true, if background color is transparent, but not "no fill"
     or the transparency of a existing background graphic is set.
 */
-const sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
+sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
 {
     sal_Bool bReturn = sal_False;
 
@@ -2925,7 +2925,7 @@ const sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
 
     @return true, if background brush is "inherited" from parent/grandparent
 */
-const sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
+sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
 {
     sal_Bool bReturn = sal_False;
 
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 852809b03478..808a5e4257e4 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fly.cxx,v $
- * $Revision: 1.92 $
+ * $Revision: 1.92.110.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2769,7 +2769,7 @@ const SwRect SwFlyFrm::GetObjBoundRect() const
 // <--
 
 // --> OD 2006-08-10 #i68520#
-const bool SwFlyFrm::_SetObjTop( const SwTwips _nTop )
+bool SwFlyFrm::_SetObjTop( const SwTwips _nTop )
 {
     const bool bChanged( Frm().Pos().Y() != _nTop );
 
@@ -2777,7 +2777,7 @@ const bool SwFlyFrm::_SetObjTop( const SwTwips _nTop )
 
     return bChanged;
 }
-const bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft )
+bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft )
 {
     const bool bChanged( Frm().Pos().X() != _nLeft );
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 102288288394..5bf6d8d8c83c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: paintfrm.cxx,v $
- * $Revision: 1.121 $
+ * $Revision: 1.121.110.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -197,7 +197,7 @@ public:
     void LockLines( BOOL bLock );
 
     /// OD 13.08.2002 - correct type of function
-    const USHORT Free() const { return nFree; }
+    USHORT Free() const { return nFree; }
 };
 
 class SwSubsRects : public SwLineRects
@@ -3295,7 +3295,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect ) const
 
     @return true, if background is transparent drawn.
 */
-const sal_Bool SwFlyFrm::IsBackgroundTransparent() const
+sal_Bool SwFlyFrm::IsBackgroundTransparent() const
 {
     sal_Bool bBackgroundTransparent = GetFmt()->IsBackgroundTransparent();
     if ( !bBackgroundTransparent &&
@@ -3347,7 +3347,7 @@ const sal_Bool SwFlyFrm::IsBackgroundTransparent() const
 
     @return true, if shadow color is transparent.
 */
-const sal_Bool SwFlyFrm::IsShadowTransparent() const
+sal_Bool SwFlyFrm::IsShadowTransparent() const
 {
     return GetFmt()->IsShadowTransparent();
 };
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 6c21e5759106..e4844762f39d 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: frmcrsr.cxx,v $
- * $Revision: 1.44 $
+ * $Revision: 1.44.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -558,12 +558,12 @@ struct SwFillData
         const Point& rPt ) : aFrm( rR ), pCMS( pC ), pPos( pP ), rPoint( rPt ),
         nLineWidth( 0 ), bFirstLine( sal_True ), bInner( sal_False ), bColumn( sal_False ),
         bEmpty( sal_True ){}
-    const SwFillMode Mode() const { return pCMS->pFill->eMode; }
-    const long X() const { return rPoint.X(); }
-    const long Y() const { return rPoint.Y(); }
-    const long Left() const { return aFrm.Left(); }
-    const long Right() const { return aFrm.Right(); }
-    const long Bottom() const { return aFrm.Bottom(); }
+    SwFillMode Mode() const { return pCMS->pFill->eMode; }
+    long X() const { return rPoint.X(); }
+    long Y() const { return rPoint.Y(); }
+    long Left() const { return aFrm.Left(); }
+    long Right() const { return aFrm.Right(); }
+    long Bottom() const { return aFrm.Bottom(); }
     SwRect& Frm() { return aFrm; }
     SwFillCrsrPos &Fill() const { return *pCMS->pFill; }
     void SetTab( MSHORT nNew ) { pCMS->pFill->nTabCnt = nNew; }
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 02ef38ffc826..5a88599c6e35 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: frmpaint.cxx,v $
- * $Revision: 1.60 $
+ * $Revision: 1.60.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -78,7 +78,7 @@
 namespace numfunc
 {
     extern const String& GetDefBulletFontname();
-    extern const bool IsDefBulletFontUserDefined();
+    extern bool IsDefBulletFontUserDefined();
 }
 // <--
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 0f5162c6d425..2e10a40a1b66 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -110,7 +110,7 @@ using namespace ::com::sun::star::beans;
 namespace numfunc
 {
     extern const String& GetDefBulletFontname();
-    extern const bool IsDefBulletFontUserDefined();
+    extern bool IsDefBulletFontUserDefined();
 }
 // <--
 
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 9d29ae3285ca..395fcd15e48a 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -291,7 +291,7 @@ public:
 
     inline const  SwViewOption &GetOpt() const { return *pOpt; }
     inline const XubString &GetTxt() const { return *pTxt; }
-    inline const xub_Unicode GetChar( const xub_StrLen nPos ) const
+    inline xub_Unicode GetChar( const xub_StrLen nPos ) const
         { return pTxt->GetChar( nPos ); }
 
     inline KSHORT      GetTxtHeight() const;
@@ -370,13 +370,13 @@ public:
     //
     // Feature: Kana Compression
     //
-    inline const MSHORT GetKanaIdx() const { return nKanaIdx; }
+    inline MSHORT GetKanaIdx() const { return nKanaIdx; }
     inline void ResetKanaIdx(){ nKanaIdx = 0; }
     inline void SetKanaIdx( MSHORT nNew ) { nKanaIdx = nNew; }
     inline void IncKanaIdx() { ++nKanaIdx; }
     inline void SetKanaComp( SvUShorts *pNew ){ pKanaComp = pNew; }
     inline SvUShorts* GetpKanaComp() const { return pKanaComp; }
-    inline const USHORT GetKanaComp() const
+    inline USHORT GetKanaComp() const
         { return ( pKanaComp && nKanaIdx < pKanaComp->Count() )
                    ? (*pKanaComp)[nKanaIdx] : 0; }
 
@@ -493,12 +493,12 @@ public:
     //
     // STUFF FOR JUSTIFIED ALIGNMENT
     //
-    inline const MSHORT GetSpaceIdx() const { return nSpaceIdx; }
+    inline MSHORT GetSpaceIdx() const { return nSpaceIdx; }
     inline void ResetSpaceIdx(){nSpaceIdx = 0; }
     inline void SetSpaceIdx( MSHORT nNew ) { nSpaceIdx = nNew; }
     inline void IncSpaceIdx() { ++nSpaceIdx; }
     inline void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); }
-    inline const long GetSpaceAdd() const
+    inline long GetSpaceAdd() const
         { return ( pSpaceAdd && nSpaceIdx < pSpaceAdd->size() )
                    ? (*pSpaceAdd)[nSpaceIdx] : 0; }
 
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 69837629d2db..18b2fec04609 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -121,7 +121,7 @@ public:
     inline SwFont *GetFnt() { return pFnt; }
     inline const SwFont *GetFnt() const { return pFnt; }
 
-    inline const BYTE GetPropFont() const { return nPropFont; }
+    inline BYTE GetPropFont() const { return nPropFont; }
     inline void SetPropFont( const BYTE nNew ) { nPropFont = nNew; }
 
     inline SwAttrHandler& GetAttrHandler() { return aAttrHandler; }
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 0425b71718f3..f1bb7e05c099 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -183,19 +183,19 @@ public:
 
     inline SwMultiPortion *GetMulti() const { return pMulti; }
 
-    inline const sal_Bool IsOnceMore() const { return bOnceMore; }
+    inline sal_Bool IsOnceMore() const { return bOnceMore; }
     inline void       SetOnceMore( sal_Bool bNew ) { bOnceMore = bNew; }
 
-    inline const sal_Bool HasChanges() const { return bChanges; }
+    inline sal_Bool HasChanges() const { return bChanges; }
     inline void       SetChanges()       { bChanges = sal_True; }
 
-    inline const sal_Bool HasTruncLines() const { return bTruncLines; }
+    inline sal_Bool HasTruncLines() const { return bTruncLines; }
     inline void       SetTruncLines( sal_Bool bNew ) { bTruncLines = bNew; }
 
-    inline const sal_Bool IsUnclipped() const { return bUnclipped; }
+    inline sal_Bool IsUnclipped() const { return bUnclipped; }
     inline void       SetUnclipped( sal_Bool bNew ) { bUnclipped = bNew; }
 
-    inline const sal_Bool IsFlyInCntBase() const { return bFlyInCntBase; }
+    inline sal_Bool IsFlyInCntBase() const { return bFlyInCntBase; }
     inline void  SetFlyInCntBase( sal_Bool bNew = sal_True ){ bFlyInCntBase = bNew; }
 
     inline SwTxtFormatInfo &GetInfo()
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 3c4b7bd7acb2..1786691ff5bc 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: porfld.hxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.100.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -70,7 +70,7 @@ public:
 
     void TakeNextOffset( const SwFldPortion* pFld );
     void CheckScript( const SwTxtSizeInfo &rInf );
-    inline const sal_Bool HasFont() const { return 0 != pFnt; }
+    inline sal_Bool HasFont() const { return 0 != pFnt; }
     // --> OD 2008-06-05 #i89179# - made public
     inline const SwFont *GetFont() const { return pFnt; }
     // <--
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 535a1db1b6b4..7c98144b05b6 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: porfly.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,7 +49,7 @@ class SwFlyPortion : public SwFixPortion
 public:
     inline  SwFlyPortion( const SwRect &rFlyRect )
         : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
-    inline const KSHORT GetBlankWidth( ) const { return nBlankWidth; }
+    inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
     inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
     virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -87,9 +87,9 @@ public:
     inline SwDrawContact *GetDrawContact() { return (SwDrawContact*)pContact; }
     inline const SwDrawContact* GetDrawContact() const
         { return (SwDrawContact*)pContact; }
-    inline const sal_Bool IsDraw() const { return bDraw; }
-    inline const sal_Bool IsMax() const { return bMax; }
-    inline const sal_uInt8 GetAlign() const { return nAlign; }
+    inline sal_Bool IsDraw() const { return bDraw; }
+    inline sal_Bool IsMax() const { return bMax; }
+    inline sal_uInt8 GetAlign() const { return nAlign; }
     inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; }
     inline void SetMax( sal_Bool bNew ) { bMax = bNew; }
     // OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 83f167d9160a..7777e5968969 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: porlin.hxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -91,7 +91,7 @@ public:
     inline SwLinePortion *GetPortion() const { return( pPortion ); }
     inline SwLinePortion &operator=(const SwLinePortion &rPortion);
     inline sal_Bool operator==( const SwLinePortion &rPortion ) const;
-    inline const xub_StrLen GetLen() const { return nLineLength; }
+    inline xub_StrLen GetLen() const { return nLineLength; }
     inline void SetLen( const xub_StrLen nLen ) { nLineLength = nLen; }
     inline void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; }
     inline KSHORT &GetAscent() { return nAscent; }
@@ -114,56 +114,56 @@ public:
     virtual SwLinePortion *Compress();
 
     inline void SetWhichPor( const MSHORT nNew )    { nWhichPor = nNew; }
-    inline const MSHORT GetWhichPor( ) const        { return nWhichPor; }
+    inline MSHORT GetWhichPor( ) const        { return nWhichPor; }
 
 // Gruppenabfragen:
-    inline const sal_Bool InTxtGrp( )   const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; }
-    inline const sal_Bool InGlueGrp( )  const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;}
-    inline const sal_Bool InTabGrp( )   const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; }
-    inline const sal_Bool InHyphGrp( )  const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;}
-    inline const sal_Bool InNumberGrp( )const { return nWhichPor & PORGRP_NUMBER ? sal_True : sal_False;}
-    inline const sal_Bool InFixGrp( )   const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False;  }
-    inline const sal_Bool InFldGrp( )   const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False;  }
-    inline const sal_Bool InToxRefGrp( ) const { return nWhichPor & PORGRP_TOXREF ? sal_True : sal_False;  }
-    inline const sal_Bool InToxRefOrFldGrp( )   const { return nWhichPor &
+    inline sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; }
+    inline sal_Bool InGlueGrp( )    const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;}
+    inline sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; }
+    inline sal_Bool InHyphGrp( )    const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;}
+    inline sal_Bool InNumberGrp( )const { return nWhichPor & PORGRP_NUMBER ? sal_True : sal_False;}
+    inline sal_Bool InFixGrp( ) const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False;  }
+    inline sal_Bool InFldGrp( ) const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False;  }
+    inline sal_Bool InToxRefGrp( ) const { return nWhichPor &   PORGRP_TOXREF ? sal_True : sal_False;  }
+    inline sal_Bool InToxRefOrFldGrp( ) const { return nWhichPor &
                                 ( PORGRP_FLD | PORGRP_TOXREF ) ? sal_True : sal_False;  }
-    inline const sal_Bool InExpGrp( )   const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False;  }
-    inline const sal_Bool InTabnLftGrp( ) const
+    inline sal_Bool InExpGrp( ) const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False;  }
+    inline sal_Bool InTabnLftGrp( ) const
         { return nWhichPor & PORGRP_TABNOTLFT ? sal_True : sal_False;  }
-    inline const sal_Bool InFixMargGrp( )const
+    inline sal_Bool InFixMargGrp( )const
         { return nWhichPor & PORGRP_FIXMARG ? sal_True : sal_False;  }
-    inline const sal_Bool InSpaceGrp( )const
+    inline sal_Bool InSpaceGrp( )const
         { return InTxtGrp() || IsMultiPortion();  }
 // Individuelle Abfragen:
-    inline const sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; }
-    inline const sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; }
-    inline const sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; }
-    inline const sal_Bool IsBreakPortion( ) const{ return nWhichPor == POR_BRK; }
-    inline const sal_Bool IsErgoSumPortion()const{ return nWhichPor == POR_ERGOSUM;}
-    inline const sal_Bool IsQuoVadisPortion()const{ return nWhichPor==POR_QUOVADIS;}
-    inline const sal_Bool IsTabCntPortion( )const{ return nWhichPor==POR_TABCENTER;}
-    inline const sal_Bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL;}
-    inline const sal_Bool IsTabLeftPortion()const{ return nWhichPor == POR_TABLEFT;}
-    inline const sal_Bool IsFtnNumPortion( )const{ return nWhichPor == POR_FTNNUM; }
-    inline const sal_Bool IsFtnPortion( )   const{ return nWhichPor == POR_FTN; }
-    inline const sal_Bool IsTmpEndPortion( )const{ return nWhichPor == POR_TMPEND; }
-    inline const sal_Bool IsDropPortion( )  const{ return nWhichPor == POR_DROP; }
-    inline const sal_Bool IsLayPortion( )   const{ return nWhichPor == POR_LAY; }
-    inline const sal_Bool IsParaPortion( )  const{ return nWhichPor == POR_PARA; }
-    inline const sal_Bool IsMarginPortion( )const{ return nWhichPor == POR_MARGIN; }
-    inline const sal_Bool IsFlyPortion( )   const{ return nWhichPor == POR_FLY; }
-    inline const sal_Bool IsHolePortion( )  const{ return nWhichPor == POR_HOLE; }
-    inline const sal_Bool IsSoftHyphPortion()const{ return nWhichPor==POR_SOFTHYPH;}
-    inline const sal_Bool IsPostItsPortion()const{ return nWhichPor == POR_POSTITS;}
-    inline const sal_Bool IsCombinedPortion()const{ return nWhichPor==POR_COMBINED;}
-    inline const sal_Bool IsTextPortion( ) const{ return nWhichPor == POR_TXT; }
-    inline const sal_Bool IsURLPortion( ) const{ return nWhichPor == POR_URL; }
-    inline const sal_Bool IsHangingPortion( ) const{ return nWhichPor == POR_HNG; }
-    inline const sal_Bool IsKernPortion( ) const{ return nWhichPor == POR_KERN; }
-    inline const sal_Bool IsArrowPortion( ) const{ return nWhichPor == POR_ARROW; }
-    inline const sal_Bool IsMultiPortion( ) const{ return nWhichPor == POR_MULTI; }
-    inline const sal_Bool IsNumberPortion( ) const{ return nWhichPor == POR_NUMBER; } // #i23726#
-    inline const sal_Bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; }
+    inline sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; }
+    inline sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; }
+    inline sal_Bool IsBlankPortion( )   const{ return nWhichPor == POR_BLANK; }
+    inline sal_Bool IsBreakPortion( )   const{ return nWhichPor == POR_BRK; }
+    inline sal_Bool IsErgoSumPortion()const{ return nWhichPor == POR_ERGOSUM;}
+    inline sal_Bool IsQuoVadisPortion()const{ return nWhichPor==POR_QUOVADIS;}
+    inline sal_Bool IsTabCntPortion( )const{ return nWhichPor==POR_TABCENTER;}
+    inline sal_Bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL;}
+    inline sal_Bool IsTabLeftPortion()const{ return nWhichPor == POR_TABLEFT;}
+    inline sal_Bool IsFtnNumPortion( )const{ return nWhichPor == POR_FTNNUM; }
+    inline sal_Bool IsFtnPortion( ) const{ return nWhichPor == POR_FTN; }
+    inline sal_Bool IsTmpEndPortion( )const{ return nWhichPor == POR_TMPEND; }
+    inline sal_Bool IsDropPortion( )    const{ return nWhichPor == POR_DROP; }
+    inline sal_Bool IsLayPortion( ) const{ return nWhichPor == POR_LAY; }
+    inline sal_Bool IsParaPortion( )    const{ return nWhichPor == POR_PARA; }
+    inline sal_Bool IsMarginPortion( )const{ return nWhichPor == POR_MARGIN; }
+    inline sal_Bool IsFlyPortion( ) const{ return nWhichPor == POR_FLY; }
+    inline sal_Bool IsHolePortion( )    const{ return nWhichPor == POR_HOLE; }
+    inline sal_Bool IsSoftHyphPortion()const{ return nWhichPor==POR_SOFTHYPH;}
+    inline sal_Bool IsPostItsPortion()const{ return nWhichPor == POR_POSTITS;}
+    inline sal_Bool IsCombinedPortion()const{ return nWhichPor==POR_COMBINED;}
+    inline sal_Bool IsTextPortion( ) const{ return nWhichPor == POR_TXT; }
+    inline sal_Bool IsURLPortion( ) const{ return nWhichPor == POR_URL; }
+    inline sal_Bool IsHangingPortion( ) const{ return nWhichPor == POR_HNG; }
+    inline sal_Bool IsKernPortion( ) const{ return nWhichPor == POR_KERN; }
+    inline sal_Bool IsArrowPortion( ) const{ return nWhichPor == POR_ARROW; }
+    inline sal_Bool IsMultiPortion( ) const{ return nWhichPor == POR_MULTI; }
+    inline sal_Bool IsNumberPortion( ) const{ return nWhichPor == POR_NUMBER; } // #i23726#
+    inline sal_Bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; }
 
     // Positionierung
     SwLinePortion *FindPrevPortion( const SwLinePortion *pRoot );
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index c1735784fda8..bbb682aa5faf 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -82,7 +82,7 @@ class SwHolePortion : public SwLinePortion
     KSHORT nBlankWidth;
 public:
             SwHolePortion( const SwTxtPortion &rPor );
-    inline const KSHORT GetBlankWidth( ) const { return nBlankWidth; }
+    inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
     inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
     virtual SwLinePortion *Compress();
     virtual sal_Bool Format( SwTxtFormatInfo &rInf );
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 6dd19f636ab3..9479d332c0d1 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: widorp.cxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.22.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -127,7 +127,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
  * naechste Seite rutscht.
  */
 
-const sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
+sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
 {
     sal_Bool bFit = sal_False;
 
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 802008792776..3607c5e31eda 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: widorp.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,15 +47,15 @@ public:
     SwTxtFrmBreak( SwTxtFrm *pFrm, const SwTwips nRst = 0  );
     sal_Bool IsBreakNow( SwTxtMargin &rLine );
 
-    const sal_Bool IsBroken() const     { return bBreak; }
-    const sal_Bool IsKeepAlways() const { return bKeep; }
-          void Keep()               { bKeep = sal_True; }
-          void Break()              { bKeep = sal_False; bBreak = sal_True; }
+    sal_Bool IsBroken() const   { return bBreak; }
+    sal_Bool IsKeepAlways() const { return bKeep; }
+    void Keep()             { bKeep = sal_True; }
+    void Break()                { bKeep = sal_False; bBreak = sal_True; }
 
     inline sal_Bool GetKeep() const { return bKeep; }
     inline void SetKeep( const sal_Bool bNew ) { bKeep = bNew; }
 
-    const sal_Bool IsInside( SwTxtMargin &rLine ) const;
+    sal_Bool IsInside( SwTxtMargin &rLine ) const;
 
     // Um Sonderfaelle mit Ftn behandeln zu koennen.
     // Mit SetRstHeight wird dem SwTxtFrmBreak die Resthoehe eingestellt,
@@ -78,9 +78,9 @@ public:
     WidowsAndOrphans( SwTxtFrm *pFrm, const SwTwips nRst = 0,
         sal_Bool bCheckKeep = sal_True );
     sal_Bool FindWidows( SwTxtFrm *pFrm, SwTxtMargin &rLine );
-    const MSHORT GetWidowsLines() const
+    MSHORT GetWidowsLines() const
     { return nWidLines; }
-    const MSHORT GetOrphansLines() const
+    MSHORT GetOrphansLines() const
     { return nOrphLines; }
     void ClrOrphLines(){ nOrphLines = 0; }
 
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index f4cf48a1edc9..b611299957f7 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fntcap.cxx,v $
- * $Revision: 1.27 $
+ * $Revision: 1.27.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -215,7 +215,7 @@ public:
         { }
     virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
     virtual void Do();
-    const xub_StrLen GetBreak() const { return nBreak; }
+    xub_StrLen GetBreak() const { return nBreak; }
 };
 
 void SwDoGetCapitalBreak::Init( SwFntObj *, SwFntObj * )
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 00fe3b1674d7..b6a092550369 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: pagepreviewlayout.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.214.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1274,7 +1274,7 @@ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const
 
     @author OD
 */
-const void SwPagePreviewLayout::_PaintSelectMarkAtPage(
+void SwPagePreviewLayout::_PaintSelectMarkAtPage(
                                     const PrevwPage* _aSelectedPrevwPage ) const
 {
     OutputDevice* pOutputDev = mrParentViewShell.GetOut();
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index ddc3b06afe92..a270c6f78492 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: vnew.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.31.210.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -390,7 +390,7 @@ ViewShell::~ViewShell()
     delete pAccOptions;
 }
 
-const BOOL ViewShell::HasDrawView() const
+BOOL ViewShell::HasDrawView() const
 {
     return Imp()->HasDrawView();
 }