make coding style of files (e-h) in sw/source/core/inc consistent

9 files changed, 89 insertions, 138 deletions

diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 0700256555f2..5b49aad7f163 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _ENVIRONMENTOFANCHOREDOBJECT_HXX
 #define _ENVIRONMENTOFANCHOREDOBJECT_HXX
 
@@ -99,7 +100,7 @@ namespace objectpositioning
             */
             const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm ) const;
     };
-} // namespace objectpositioning
+}
 
 #endif
 
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 0f2cfbed86ea..13b3c05a2a40 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -27,7 +27,9 @@
  ************************************************************************/
 #ifndef _FLYFRMS_HXX
 #define _FLYFRMS_HXX
+
 #include "flyfrm.hxx"
+
 // #i28701#
 class SwFlyAtCntFrm;
 
@@ -55,8 +57,6 @@ class SwFlyFreeFrm : public SwFlyFrm
         return <true>, if such a frame is found and it has 'auto' size.
         otherwise <false> is returned.
 
-        @author OD
-
         @return boolean indicating, that direct environment has 'auto' size
     */
     bool HasEnvironmentAutoSize() const;
@@ -67,7 +67,6 @@ protected:
     friend class SwFlyNotify;
     virtual void NotifyBackground( SwPageFrm *pPage,
                                    const SwRect& rRect, PrepareHint eHint);
-
     SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
 
 public:
@@ -233,6 +232,7 @@ inline void SwFlyInCntFrm::InvalidateCntnt() const
 {
     ((SwFlyInCntFrm*)this)->bInvalidCntnt = sal_True;
 }
+
 inline void SwFlyInCntFrm::ValidateLayout() const
 {
     ((SwFlyInCntFrm*)this)->bInvalidLayout = sal_False;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 3346321aa93c..e0eeb508355e 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -30,7 +30,6 @@
 
 #include <vcl/font.hxx>
 #include <tools/mempool.hxx>
-
 #include "swtypes.hxx"
 #include "swcache.hxx"
 
@@ -43,10 +42,6 @@ class ViewShell;
 class SwSubFont;
 class MapMode;
 
-/*************************************************************************
- *                      class SwFntCache
- *************************************************************************/
-
 class SwFntCache : public SwCache
 {
 public:
@@ -69,10 +64,6 @@ extern SwFntObj *pLastFont;
 extern sal_uInt8 *pMagicNo;
 extern Color *pWaveCol;
 
-/*************************************************************************
- *                      class SwFntObj
- *************************************************************************/
-
 class SwFntObj : public SwCacheObj
 {
     friend class SwFntAccess;
@@ -138,11 +129,6 @@ public:
     void CreatePrtFont( const OutputDevice& rOut );
 };
 
-/*************************************************************************
- *                      class SwFntAccess
- *************************************************************************/
-
-
 class SwFntAccess : public SwCacheAccess
 {
     ViewShell *pShell;
@@ -156,7 +142,6 @@ public:
     inline SwFntObj* Get() { return (SwFntObj*) SwCacheAccess::Get(); };
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index a13013f75d13..544655a1a093 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -95,28 +95,9 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr;
 #define FRM_FTNBOSS     0x0006
 #define FRM_ACCESSIBLE (FRM_HEADER|FRM_FOOTER|FRM_FTN|FRM_TXT|FRM_ROOT|FRM_FLY|FRM_TAB|FRM_CELL|FRM_PAGE)
 
-        //Weils so schon ist das ganze als Bitfeld....
-//0000 0000 0000 0001   ROOT
-//0000 0000 0000 0010   PAGE
-//0000 0000 0000 0100   COLUMN
-//0000 0000 0000 1000   HEADER
-//0000 0000 0001 0000   FOOTER
-//0000 0000 0010 0000   FTNCONT
-//0000 0000 0100 0000   FTN
-//0000 0000 1000 0000   BODY
-//0000 0001 0000 0000   FLY
-//0000 0010 0000 0000   SECTION
-//0000 0100 0000 0000   UNUSED
-//0000 1000 0000 0000   TAB
-//0001 0000 0000 0000   ROW
-//0010 0000 0000 0000   CELL
-//0100 0000 0000 0000   TXT
-//1000 0000 0000 0000   NOTXT
-
 // The type of the frame is internal represented by the 4-bit value nType,
 // which can expanded to the types above by shifting a bit (0x1 << nType)
 // Here are the corresponding defines for the compressed representation:
-
 #define FRMC_ROOT        0
 #define FRMC_PAGE        1
 #define FRMC_COLUMN      2
@@ -246,7 +227,6 @@ enum MakePageType
     MAKEPAGE_NOSECTION  // Don't create section frames
 };
 
-
 /**
  * Base class of the Writer layout elements.
  *
@@ -275,8 +255,6 @@ class SwFrm: public SwClient, public SfxBroadcaster
     // implemented in text/txtftn.cxx, prevents Ftn oscillation
     friend void ValidateTxt( SwFrm *pFrm );
 
-//  friend void CalcAnchorAndKeep( SwFlyFrm * );
-
     friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
 
     // cache for (border) attributes
@@ -353,7 +331,6 @@ class SwFrm: public SwClient, public SfxBroadcaster
     */
     SwCntntFrm* _FindPrevCnt( const bool _bInSameFtn = false );
 
-
     void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & );
     SwFrm* _GetIndNext();
     void SetDirFlags( sal_Bool bVert );
@@ -366,31 +343,31 @@ protected:
     SwRect  aFrm;   // absolute position in document and size of the Frm
     SwRect  aPrt;   // position relatively to Frm and size of PrtArea
 
-    sal_uInt16 bReverse:        1; // Next line above/at the right side instead
-                               // under/at the left side of the previous line.
-    sal_uInt16 bInvalidR2L:     1;
-    sal_uInt16 bDerivedR2L:     1;
-    sal_uInt16 bRightToLeft:    1;
-    sal_uInt16 bInvalidVert:    1;
-    sal_uInt16 bDerivedVert:    1;
-    sal_uInt16 bVertical:       1;
+    sal_uInt16 bReverse     : 1; // Next line above/at the right side instead
+                                 // under/at the left side of the previous line
+    sal_uInt16 bInvalidR2L  : 1;
+    sal_uInt16 bDerivedR2L  : 1;
+    sal_uInt16 bRightToLeft : 1;
+    sal_uInt16 bInvalidVert : 1;
+    sal_uInt16 bDerivedVert : 1;
+    sal_uInt16 bVertical    : 1;
     // Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
-    sal_uInt16 bVertLR:         1;
-    sal_uInt16 nType:         4;  //Who am I?
-
-    sal_Bool bValidPos:         1;
-    sal_Bool bValidPrtArea:     1;
-    sal_Bool bValidSize:        1;
-    sal_Bool bValidLineNum:     1;
-    sal_Bool bFixSize:          1;
-    sal_Bool bUnUsed1:          1;
+    sal_uInt16 bVertLR      : 1;
+    sal_uInt16 nType        : 4;  //Who am I?
+
+    sal_Bool bValidPos      : 1;
+    sal_Bool bValidPrtArea  : 1;
+    sal_Bool bValidSize     : 1;
+    sal_Bool bValidLineNum  : 1;
+    sal_Bool bFixSize       : 1;
+    sal_Bool bUnUsed1       : 1;
     // if sal_True, frame will be painted completely even content was changed
     // only partially. For CntntFrms a border (from Action) will exclusively
     // painted if <bCompletePaint> is sal_True.
     sal_Bool bCompletePaint : 1;
     sal_Bool bRetouche      : 1; // frame is responsible for retouching
 public:
-    sal_Bool bUnUsed2:          1;
+    sal_Bool bUnUsed2       : 1;
 protected:
     sal_Bool bInfInvalid    : 1;  // InfoFlags are invalid
     sal_Bool bInfBody       : 1;  // Frm is in document body
@@ -598,11 +575,10 @@ public:
 
         @return boolean, indicating, if frame is moveable in given environment
     */
-//    sal_Bool IsMoveable() const;
     bool IsMoveable( const SwLayoutFrm* _pLayoutFrm = 0L ) const;
 
     // Is it permitted for the (Txt)Frm to add a footnote in the current
-    // environment (not e.g. for repeating table headlines)?
+    // environment (not e.g. for repeating table headlines)
     sal_Bool IsFtnAllowed() const;
 
     virtual void  Format( const SwBorderAttrs *pAttrs = 0 );
@@ -738,11 +714,11 @@ public:
 
     // Only invalidate Frm
     // #i28701# - add call to method <_ActionOnInvalidation(..)>
-    // for all invalidation methods.
+    //            for all invalidation methods.
     // #i28701# - use method <_InvalidationAllowed(..)> to
-    // decide, if invalidation will to be performed or not.
+    //            decide, if invalidation will to be performed or not.
     // #i26945# - no additional invalidation, if it's already
-    // invalidate.
+    //            invalidate.
     void _InvalidateSize()
     {
         if ( bValidSize && _InvalidationAllowed( INVALID_SIZE ) )
@@ -991,17 +967,14 @@ inline SwLayoutFrm *SwFrm::GetNextLayoutLeaf()
 {
     return (SwLayoutFrm*)((const SwFrm*)this)->GetNextLayoutLeaf();
 }
-
 inline SwLayoutFrm *SwFrm::GetPrevLayoutLeaf()
 {
     return (SwLayoutFrm*)((const SwFrm*)this)->GetPrevLayoutLeaf();
 }
-
 inline const SwLayoutFrm *SwFrm::GetNextLayoutLeaf() const
 {
     return ImplGetNextLayoutLeaf( true );
 }
-
 inline const SwLayoutFrm *SwFrm::GetPrevLayoutLeaf() const
 {
     return ImplGetNextLayoutLeaf( false );
@@ -1027,7 +1000,6 @@ inline void SwFrm::InvalidateLineNum()
     if ( bValidLineNum )
         ImplInvalidateLineNum();
 }
-
 inline void SwFrm::InvalidateAll()
 {
     if ( _InvalidationAllowed( INVALID_ALL ) )
@@ -1040,7 +1012,6 @@ inline void SwFrm::InvalidateAll()
         _ActionOnInvalidation( INVALID_ALL );
     }
 }
-
 inline void SwFrm::InvalidateNextPos( sal_Bool bNoFtn )
 {
     if ( pNext && !pNext->IsSctFrm() )
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 555ab64c1826..16313487f4bb 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _FRMINF_HXX
 #define _FRMINF_HXX
 
@@ -34,10 +35,6 @@ class SwTxtFrm;
 class SwPaM;
 class SwTxtCursor;
 
-/*************************************************************************
- *                      class SwTxtFrmInfo
- *************************************************************************/
-
 class SwTxtFrmInfo
 {
     const SwTxtFrm *pFrm;
@@ -78,8 +75,6 @@ public:
                         const SwTxtFrm *pNextFrm = 0 ) const;
 };
 
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 5cef92a99804..abf3d2bf27b1 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -25,8 +25,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _FRMTOOL_HXX
 #define _FRMTOOL_HXX
+
 #include "swtypes.hxx"
 #include "layfrm.hxx"
 #include "frmatr.hxx"
@@ -57,17 +59,17 @@ struct SwFindRowSpanCacheObj;
 #define GRFNUM_REPLACE 2
 
 // draw background with brush or graphics
-// - add 6th parameter to indicate that method should
-//     consider background transparency, saved in the color of the brush item
+// The 6th parameter indicates that the method should consider background
+// transparency, saved in the color of the brush item.
 void DrawGraphic( const SvxBrushItem *, OutputDevice *,
                   const SwRect &rOrg, const SwRect &rOut, const sal_uInt8 nGrfNum = GRFNUM_NO,
                   const sal_Bool bConsiderBackgroundTransparency = sal_False );
 
-// - method to align rectangle
+// method to align rectangle.
 // Created declaration here to avoid <extern> declarations
 void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
 
-// - method to align graphic rectangle
+// method to align graphic rectangle
 // Created declaration here to avoid <extern> declarations
 void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
 
@@ -120,6 +122,7 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
 
 sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj );
 
+// FIXME: EasyHack (refactoring): rename method and parameter name in all files
 const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp );
 
 sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
@@ -127,9 +130,12 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
 const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
 
 // used by SwCntntNode::GetFrm and SwFlyFrm::GetFrm
-SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 const nFrmType, const Point* = 0,
-                        const SwPosition *pPos = 0,
-                        const sal_Bool bCalcFrm = sal_False );
+SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
+                       SwModify const&,
+                       sal_uInt16 const nFrmType,
+                       const Point* = 0,
+                       const SwPosition *pPos = 0,
+                       const sal_Bool bCalcFrm = sal_False );
 
 // Should extra data (reline stroke, line numbers) be painted?
 sal_Bool IsExtraData( const SwDoc *pDoc );
@@ -175,6 +181,7 @@ class SwLayNotify : public SwFrmNotify
     sal_Bool bLowersComplete;
 
     SwLayoutFrm *GetLay() { return (SwLayoutFrm*)pFrm; }
+
 public:
     SwLayNotify( SwLayoutFrm *pLayFrm );
     ~SwLayNotify();
@@ -188,6 +195,7 @@ class SwFlyNotify : public SwLayNotify
     SwPageFrm *pOldPage;
     const SwRect aFrmAndSpace;
     SwFlyFrm *GetFly() { return (SwFlyFrm*)pFrm; }
+
 public:
     SwFlyNotify( SwFlyFrm *pFlyFrm );
     ~SwFlyNotify();
@@ -244,26 +252,25 @@ class SwBorderAttrs : public SwCacheObj
 
     // the following bool values set the cached values to INVALID - until they
     // are calculated for the first time
-    sal_Bool bTopLine       :1;
-    sal_Bool bBottomLine    :1;
-    sal_Bool bLeftLine      :1;
-    sal_Bool bRightLine     :1;
-    sal_Bool bTop           :1;
-    sal_Bool bBottom        :1;
-    sal_Bool bLine          :1;
+    sal_Bool bTopLine     : 1;
+    sal_Bool bBottomLine  : 1;
+    sal_Bool bLeftLine    : 1;
+    sal_Bool bRightLine   : 1;
+    sal_Bool bTop         : 1;
+    sal_Bool bBottom      : 1;
+    sal_Bool bLine        : 1;
 
     sal_Bool bIsLine      : 1; // border on at least one side?
 
     sal_Bool bCacheGetLine        : 1; // cache GetTopLine(), GetBottomLine()?
     sal_Bool bCachedGetTopLine    : 1; // is GetTopLine() cached?
     sal_Bool bCachedGetBottomLine : 1; // is GetBottomLine() cached?
-    // - booleans indicating, if values <bJoinedWithPrev>
-    //          and <bJoinedWithNext> are cached and valid.
-    //          Caching depends on value of <bCacheGetLine>.
-    mutable sal_Bool bCachedJoinedWithPrev :1;
-    mutable sal_Bool bCachedJoinedWithNext :1;
-    // - booleans indicating, if borders are joined
-    //          with previous/next frame.
+    // Booleans indicate that <bJoinedWithPrev> and <bJoinedWithNext> are
+    // cached and valid.
+    // Caching depends on value of <bCacheGetLine>.
+    mutable sal_Bool bCachedJoinedWithPrev : 1;
+    mutable sal_Bool bCachedJoinedWithNext : 1;
+    // Booleans indicate that borders are joined with previous/next frame.
     sal_Bool bJoinedWithPrev :1;
     sal_Bool bJoinedWithNext :1;
 
@@ -289,24 +296,20 @@ class SwBorderAttrs : public SwCacheObj
 
     void _IsLine();
 
-    // #i25029# - add optional 2nd parameter <_pPrevFrm>
-    // If set, its value is taken for testing, if borders/shadow have to joined
-    // with previous frame.
+    // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+    // borders/shadow have to be joined with previous frame.
     void _GetTopLine   ( const SwFrm& _rFrm,
                          const SwFrm* _pPrevFrm = 0L );
     void _GetBottomLine( const SwFrm& _rFrm );
 
-    // - private methods to calculate cached values
-    // <bJoinedWithPrev> and <bJoinedWithNext>.
-    // #i25029# - add optional 2nd parameter <_pPrevFrm>
-    // If set, its value is taken for testing, if borders/shadow have to joined
-    // with previous frame.
+    // calculate cached values <bJoinedWithPrev> and <bJoinedWithNext>
+    // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+    // borders/shadow have to be joined with previous frame.
     void _CalcJoinedWithPrev( const SwFrm& _rFrm,
                               const SwFrm* _pPrevFrm = 0L );
     void _CalcJoinedWithNext( const SwFrm& _rFrm );
 
-    // - internal helper method for methods
-    // <_CalcJoinedWithPrev> and <_CalcJoinedWithNext>.
+    // internal helper method for _CalcJoinedWithPrev and _CalcJoinedWithNext
     sal_Bool _JoinWithCmp( const SwFrm& _rCallerFrm,
                        const SwFrm& _rCmpFrm ) const;
 
@@ -342,19 +345,17 @@ public:
 
     inline sal_Bool IsBorderDist() const { return bBorderDist; }
 
-    //Sollen obere bzw. untere Umrandung fuer den Frm ausgewertet werden?
-    // #i25029# - add optional 2nd parameter <_pPrevFrm>
-    // If set, its value is taken for testing, if borders/shadow have to joined
-    // with previous frame.
+    // Should upper (or lower) border be evaluated for this frame?
+    // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+    // borders/shadow have to be joined with previous frame.
     inline sal_uInt16 GetTopLine   ( const SwFrm& _rFrm,
                                  const SwFrm* _pPrevFrm = 0L ) const;
     inline sal_uInt16 GetBottomLine( const SwFrm& _rFrm ) const;
     inline void   SetGetCacheLine( sal_Bool bNew ) const;
-    // - accessors for cached values <bJoinedWithPrev>
-    // and <bJoinedWithPrev>
-    // #i25029# - add optional 2nd parameter <_pPrevFrm>
-    // If set, its value is taken for testing, if borders/shadow have to joined
-    // with previous frame.
+
+    // Accessors for cached values <bJoinedWithPrev> and <bJoinedWithPrev>
+    // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
+    // borders/shadow have to be joined with previous frame.
     sal_Bool JoinedWithPrev( const SwFrm& _rFrm,
                          const SwFrm* _pPrevFrm = 0L ) const;
     sal_Bool JoinedWithNext( const SwFrm& _rFrm ) const;
@@ -381,6 +382,7 @@ class SwOrderIter
     const SwPageFrm *pPage;
     const SdrObject *pCurrent;
     const sal_Bool bFlysOnly;
+
 public:
     SwOrderIter( const SwPageFrm *pPage, sal_Bool bFlysOnly = sal_True );
 
@@ -393,11 +395,11 @@ public:
     const SdrObject *Prev();
 };
 
-
 class StackHack
 {
     static sal_uInt8 nCnt;
     static sal_Bool bLocked;
+
 public:
     StackHack()
     {
@@ -437,8 +439,7 @@ inline void SwBorderAttrs::SetGetCacheLine( sal_Bool bNew ) const
     ((SwBorderAttrs*)this)->bCacheGetLine = bNew;
     ((SwBorderAttrs*)this)->bCachedGetBottomLine =
     ((SwBorderAttrs*)this)->bCachedGetTopLine = sal_False;
-    // - invalidate cache for values <bJoinedWithPrev>
-    // and <bJoinedWithNext>.
+    // invalidate cache for values <bJoinedWithPrev> and <bJoinedWithNext>
     bCachedJoinedWithPrev = sal_False;
     bCachedJoinedWithNext = sal_False;
 }
@@ -532,13 +533,11 @@ const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ );
 
 class SwDeletionChecker
 {
-    private:
-
+private:
     const SwFrm* mpFrm;
     const SwModify* mpRegIn;
 
-    public:
-
+public:
     SwDeletionChecker( const SwFrm* pFrm )
             : mpFrm( pFrm ),
               mpRegIn( pFrm ? const_cast<SwFrm*>(pFrm)->GetRegisteredIn() : 0 )
@@ -553,6 +552,6 @@ class SwDeletionChecker
     bool HasBeenDeleted();
 };
 
-#endif  //_FRMTOOL_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index def0decd23cd..2083fc02c4f6 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _FTNBOSS_HXX
 #define _FTNBOSS_HXX
 
@@ -65,10 +66,11 @@ class SwFtnBossFrm: public SwLayoutFrm
     SwFtnContFrm *MakeFtnCont();
     SwFtnFrm     *FindFirstFtn();
     sal_uInt8 _NeighbourhoodAdjustment( const SwFrm* pFrm ) const;
-protected:
 
+protected:
     void          InsertFtn( SwFtnFrm * );
     static void   ResetFtn( const SwFtnFrm *pAssumed );
+
 public:
     inline SwFtnBossFrm( SwFrmFmt* pFmt, SwFrm* pSib ) : SwLayoutFrm( pFmt, pSib ) {}
 
@@ -109,9 +111,9 @@ public:
                               SvPtrarr&           _rFtnArr,
                               const sal_Bool      _bCollectOnlyPreviousFtns = sal_False,
                               const SwFtnBossFrm* _pRefFtnBossFrm = NULL);
-    /// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFtns> in
-    /// order to control, if only footnotes, which are positioned before the
-    /// footnote boss frame <this> have to be collected.
+    // The parameter <_bCollectOnlyPreviousFtns> controls if only footnotes
+    // that are positioned before the footnote boss-frame <this> have to be
+    // collected.
     void    CollectFtns( const SwCntntFrm* _pRef,
                          SwFtnBossFrm*     _pOld,
                          SvPtrarr&         _rFtnArr,
@@ -129,11 +131,12 @@ inline const SwLayoutFrm *SwFtnBossFrm::FindBodyCont() const
 {
     return ((SwFtnBossFrm*)this)->FindBodyCont();
 }
+
 inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const
 {
     return ((SwFtnBossFrm*)this)->FindFtnCont();
 }
 
-#endif  //_FTNBOSS_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index d78db52d1cff..90b84d69d595 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _FTNFRM_HXX
 #define _FTNFRM_HXX
 
@@ -76,7 +77,6 @@ protected:
     virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
 #endif
 
-
 public:
     SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* );
 
@@ -88,8 +88,6 @@ public:
     sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const;
 
 #ifdef DBG_UTIL
-    // in a non pro version test if the attribute has the same
-    // meaning which his reference is
     const SwCntntFrm *GetRef() const;
          SwCntntFrm  *GetRef();
 #else
@@ -135,18 +133,17 @@ public:
     {
         return mbUnlockPosOfLowerObjs;
     }
+
     /** search for last content in the current footnote frame
 
         OD 2005-12-02 #i27138#
 
-        @author OD
-
         @return SwCntntFrm*
         pointer to found last content frame. NULL, if none is found.
     */
     SwCntntFrm* FindLastCntnt();
 };
 
-#endif  //_FTNFRM_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 993da3228853..b5fb7793bdce 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -25,20 +25,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _HFFRM_HXX
 #define _HFFRM_HXX
 
 #include <tools/mempool.hxx>
-
 #include "layfrm.hxx"
 
-
 class SwHeadFootFrm : public SwLayoutFrm
 {
 protected:
     void FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs);
     void FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs);
     inline sal_Bool GetEatSpacing() const; // in hffrm.cxx
+
 public:
     SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType);
     virtual void Format( const SwBorderAttrs *pAttrs = 0 );
@@ -67,6 +67,6 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm)
 };
 
-#endif  //_HFFRM_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */