CWS-TOOLING: integrate CWS cmcfixes49

6 files changed, 16 insertions, 16 deletions

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; }