make coding style of files (a-d) in sw/source/core/inc consistent

20 files changed, 179 insertions, 158 deletions

diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 8e86aa9df220..78a2a864d2af 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -25,14 +25,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _ACORRECT_HXX
 #define _ACORRECT_HXX
 
 #include <editeng/svxacorr.hxx>
-
 #include <swundo.hxx>
 
-
 class SwEditShell;
 class SwPaM;
 class SwNodeIndex;
@@ -42,6 +41,7 @@ class SfxItemSet;
 class SwDontExpandItem
 {
     SfxItemSet* pDontExpItems;
+
 public:
     SwDontExpandItem() :
         pDontExpItems(0){}
@@ -105,6 +105,7 @@ class SwAutoCorrExceptWord
     sal_Unicode cChar;
     LanguageType eLanguage;
     sal_Bool bDeleted;
+
 public:
     SwAutoCorrExceptWord( sal_uLong nAFlags, sal_uLong nNd, xub_StrLen nContent,
                                         const String& rWord, sal_Unicode cChr,
@@ -118,7 +119,6 @@ public:
     sal_Bool CheckDelChar( const SwPosition& rPos );
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 88affdb989b2..dc1ceaf7a0e9 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _ANCHOREDOBJECTPOSITION_HXX
 #define _ANCHOREDOBJECTPOSITION_HXX
 
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index df8e52c37d7d..c60f8f604428 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -25,8 +25,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _ASCHARANCHOREDOBJECTPOSITION_HXX
 #define _ASCHARANCHOREDOBJECTPOSITION_HXX
+
 #include <anchoredobjectposition.hxx>
 #include <sal/types.h>
 #include <swtypes.hxx>
diff --git a/sw/source/core/inc/attrhint.hxx b/sw/source/core/inc/attrhint.hxx
index a2c7b2fbf0ab..acedb39f4561 100644
--- a/sw/source/core/inc/attrhint.hxx
+++ b/sw/source/core/inc/attrhint.hxx
@@ -34,6 +34,7 @@
 class SwAttrHint : public SfxHint
 {
     sal_Int32   nId;
+
 public:
     SwAttrHint( sal_Int32 n )
         : nId(n)
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 40054b624080..f89fa3cfa7bb 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _BLINK_HXX
 #define _BLINK_HXX
 
@@ -34,7 +35,6 @@ class SwTxtFrm;
 
 #include <vcl/timer.hxx>
 #include <tools/gen.hxx>
-
 #include <svl/svarray.hxx>
 
 class SwBlinkPortion
@@ -43,6 +43,7 @@ class SwBlinkPortion
     const SwLinePortion *pPor;
     const SwRootFrm     *pFrm;
     sal_uInt16              nDir;
+
 public:
     SwBlinkPortion( const SwLinePortion* pPortion, sal_uInt16 nDirection )
             { pPor = pPortion; nDir = nDirection; }
@@ -68,6 +69,7 @@ class SwBlink
     SwBlinkList     aList;
     AutoTimer       aTimer;
     sal_Bool            bVisible;
+
 public:
     SwBlink();
     ~SwBlink();
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 1513cc12b3d3..51082a0cb27f 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -41,6 +41,7 @@ protected:
 #if defined ( GCC) && defined ( C272 )
     ~SwBodyFrm();
 #endif
+
 public:
     SwBodyFrm( SwFrmFmt*, SwFrm* );
 
@@ -50,6 +51,6 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm)
 };
 
-#endif  //_BODYFRM_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index b62c84ccac52..9739a9951b42 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -30,36 +30,36 @@
 #define _BOOKMRK_HXX
 
 #include <cppuhelper/weakref.hxx>
-
 #include <sfx2/Metadatable.hxx>
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <map>
 #include <rtl/ustring.hxx>
-
 #include <IMark.hxx>
 
-
-namespace com { namespace sun { namespace star {
-    namespace text { class XTextContent; }
-} } }
+namespace com {
+    namespace sun {
+        namespace star {
+            namespace text {
+                class XTextContent;
+            }
+        }
+    }
+}
 
 struct SwPosition;  // fwd Decl. wg. UI
 class SwDoc;
 
-namespace sw { namespace mark
-{
-    class MarkBase
-        : virtual public IMark
-    {
+namespace sw {
+    namespace mark {
+        class MarkBase
+            : virtual public IMark
+        {
         public:
-            //getters
             virtual SwPosition& GetMarkPos() const
                 { return *m_pPos1; }
             virtual const ::rtl::OUString& GetName() const
                 { return m_aName; }
-            virtual bool IsCoveringPosition(const SwPosition& rPos) const;
             virtual SwPosition& GetOtherMarkPos() const
             {
                 OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." );
@@ -81,10 +81,11 @@ namespace sw { namespace mark
                 else
                     return GetOtherMarkPos( );
             }
+
+            virtual bool IsCoveringPosition(const SwPosition& rPos) const;
             virtual bool IsExpanded() const
                 { return m_pPos2; }
 
-            //setters
             virtual void SetName(const ::rtl::OUString& rName)
                 { m_aName = rName; }
             virtual void SetMarkPos(const SwPosition& rNewPos);
@@ -101,7 +102,8 @@ namespace sw { namespace mark
             }
 
             virtual void InitDoc(SwDoc* const)
-            {}
+            {
+            }
 
             virtual ~MarkBase();
 
@@ -116,8 +118,7 @@ namespace sw { namespace mark
             // SwClient
             virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
 
-            MarkBase(const SwPaM& rPaM,
-                const ::rtl::OUString& rName);
+            MarkBase(const SwPaM& rPaM, const ::rtl::OUString& rName);
             ::boost::scoped_ptr<SwPosition> m_pPos1;
             ::boost::scoped_ptr<SwPosition> m_pPos2;
             ::rtl::OUString m_aName;
@@ -125,29 +126,28 @@ namespace sw { namespace mark
 
             ::com::sun::star::uno::WeakReference<
                 ::com::sun::star::text::XTextContent> m_wXBookmark;
-    };
+        };
 
-    class NavigatorReminder
-        : public MarkBase
-    {
+        class NavigatorReminder
+            : public MarkBase
+        {
         public:
             NavigatorReminder(const SwPaM& rPaM);
-    };
+        };
 
-    class UnoMark
-        : public MarkBase
-    {
+        class UnoMark
+            : public MarkBase
+        {
         public:
             UnoMark(const SwPaM& rPaM);
-    };
+        };
 
-    class DdeBookmark
-        : public MarkBase
-    {
+        class DdeBookmark
+            : public MarkBase
+        {
         public:
             DdeBookmark(const SwPaM& rPaM);
 
-            //getters
             const SwServerObject* GetRefObject() const
                 { return &m_aRefObj; }
             SwServerObject* GetRefObject()
@@ -156,20 +156,20 @@ namespace sw { namespace mark
             bool IsServer() const
                 { return m_aRefObj.Is(); }
 
-            //setters
             void SetRefObject( SwServerObject* pObj );
 
             void DeregisterFromDoc(SwDoc* const pDoc);
             virtual ~DdeBookmark();
+
         private:
             SwServerObjectRef m_aRefObj;
-    };
+        };
 
-    class Bookmark
-        : virtual public IBookmark
-        , public DdeBookmark
-        , public ::sfx2::Metadatable
-    {
+        class Bookmark
+            : virtual public IBookmark
+            , public DdeBookmark
+            , public ::sfx2::Metadatable
+        {
         public:
             Bookmark(const SwPaM& rPaM,
                 const KeyCode& rCode,
@@ -197,16 +197,15 @@ namespace sw { namespace mark
         private:
             KeyCode m_aCode;
             ::rtl::OUString m_sShortName;
-    };
+        };
 
-    class Fieldmark
-        : virtual public IFieldmark
-        , public MarkBase
-    {
+        class Fieldmark
+            : virtual public IFieldmark
+            , public MarkBase
+        {
         public:
             Fieldmark(const SwPaM& rPaM);
 
-            // getters
             virtual ::rtl::OUString GetFieldname() const
                 { return m_aFieldname; }
             virtual ::rtl::OUString GetFieldHelptext() const
@@ -218,7 +217,6 @@ namespace sw { namespace mark
             virtual const IFieldmark::parameter_map_t* GetParameters() const
                 { return &m_vParams; }
 
-            // setters
             virtual void SetFieldname(const ::rtl::OUString& aFieldname)
                 { m_aFieldname = aFieldname; }
             virtual void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext)
@@ -226,24 +224,25 @@ namespace sw { namespace mark
 
             virtual void Invalidate();
             virtual rtl::OUString ToString() const;
+
         private:
             ::rtl::OUString m_aFieldname;
             ::rtl::OUString m_aFieldHelptext;
             IFieldmark::parameter_map_t m_vParams;
-    };
+        };
 
-    class TextFieldmark
-        : public Fieldmark
-    {
+        class TextFieldmark
+            : public Fieldmark
+        {
         public:
             TextFieldmark(const SwPaM& rPaM);
             virtual void InitDoc(SwDoc* const io_pDoc);
-    };
+        };
 
-    class CheckboxFieldmark
-        : virtual public ICheckboxFieldmark
-        , public Fieldmark
-    {
+        class CheckboxFieldmark
+            : virtual public ICheckboxFieldmark
+            , public Fieldmark
+        {
         public:
             CheckboxFieldmark(const SwPaM& rPaM);
             virtual void InitDoc(SwDoc* const io_pDoc);
@@ -251,9 +250,9 @@ namespace sw { namespace mark
             void SetChecked(bool checked);
 
             virtual rtl::OUString toString( ) const;
-    };
-
-}}
+        };
+    }
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index c0a6ce64c91a..0bc62ae8059a 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -25,11 +25,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef SW_CELLFRM_HXX
 #define SW_CELLFRM_HXX
 
 #include <tools/mempool.hxx>
-
 #include "layfrm.hxx"
 
 class SwTableBox;
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index a105d20863c4..01cc47f2280d 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -25,8 +25,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _CNTFRM_HXX
 #define _CNTFRM_HXX
+
 #include "frame.hxx"
 #include "flowfrm.hxx"
 #include "cshtyp.hxx"
@@ -62,7 +64,6 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
     const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const;
 
 protected:
-
     sal_Bool MakePrtArea( const SwBorderAttrs & );
 
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
@@ -78,9 +79,9 @@ public:
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 
-    inline       SwCntntNode *GetNode();
     inline const SwCntntNode *GetNode() const;
-                 sal_uInt16       GetSectionLevel();
+    inline       SwCntntNode *GetNode();
+    sal_uInt16 GetSectionLevel();
 
     inline const SwCntntFrm *GetFollow() const;
     inline       SwCntntFrm *GetFollow();
@@ -89,18 +90,18 @@ public:
     SwTxtFrm* FindMaster() const;
 
     // layout dependent cursor travelling
-    virtual sal_Bool    LeftMargin( SwPaM * ) const;
-    virtual sal_Bool    RightMargin( SwPaM *, sal_Bool bAPI = sal_False ) const;
-    virtual sal_Bool    UnitUp( SwPaM *, const SwTwips nOffset = 0,
-                            sal_Bool bSetInReadOnly = sal_False ) const;
-    virtual sal_Bool    UnitDown( SwPaM *, const SwTwips nOffset = 0,
-                            sal_Bool bSetInReadOnly = sal_False ) const;
-    inline  sal_Bool    StartNextPage( SwPaM * ) const;
-    inline  sal_Bool    StartPrevPage( SwPaM * ) const;
-    inline  sal_Bool    StartCurrPage( SwPaM * ) const;
-    inline  sal_Bool    EndCurrPage( SwPaM * ) const;
-    inline  sal_Bool    EndNextPage( SwPaM * ) const;
-    inline  sal_Bool    EndPrevPage( SwPaM * ) const;
+    virtual sal_Bool LeftMargin( SwPaM * ) const;
+    virtual sal_Bool RightMargin( SwPaM *, sal_Bool bAPI = sal_False ) const;
+    virtual sal_Bool UnitUp( SwPaM *, const SwTwips nOffset = 0,
+                             sal_Bool bSetInReadOnly = sal_False ) const;
+    virtual sal_Bool UnitDown( SwPaM *, const SwTwips nOffset = 0,
+                               sal_Bool bSetInReadOnly = sal_False ) const;
+    inline  sal_Bool StartNextPage( SwPaM * ) const;
+    inline  sal_Bool StartPrevPage( SwPaM * ) const;
+    inline  sal_Bool StartCurrPage( SwPaM * ) const;
+    inline  sal_Bool EndCurrPage( SwPaM * ) const;
+    inline  sal_Bool EndNextPage( SwPaM * ) const;
+    inline  sal_Bool EndPrevPage( SwPaM * ) const;
 
     // nMaxHeight is the required height
     // bSplit indicates that the paragraph has to be split
@@ -134,11 +135,11 @@ inline SwCntntFrm* SwCntntFrm::GetPrevCntntFrm() const
 
 inline SwCntntNode *SwCntntFrm::GetNode()
 {
-    return static_cast< SwCntntNode* >( GetDep());
+    return static_cast< SwCntntNode* >( GetDep() );
 }
 inline const SwCntntNode *SwCntntFrm::GetNode() const
 {
-    return static_cast< const SwCntntNode* >( GetDep());
+    return static_cast< const SwCntntNode* >( GetDep() );
 }
 
 inline const SwCntntFrm *SwCntntFrm::GetFollow() const
@@ -149,6 +150,7 @@ inline SwCntntFrm *SwCntntFrm::GetFollow()
 {
     return (SwCntntFrm*)SwFlowFrm::GetFollow();
 }
+
 inline const SwCntntFrm *SwCntntFrm::GetPrecede() const
 {
     return (const SwCntntFrm*)SwFlowFrm::GetPrecede();
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index b3c3382cd776..1de97c811bed 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _COLFRM_HXX
 #define _COLFRM_HXX
 
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 59227e8b7e66..2e9b5e761b99 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _CROSSREFBOOKMRK_HXX
 #define _CROSSREFBOOKMRK_HXX
 
@@ -32,12 +33,11 @@
 #include <bookmrk.hxx>
 #include <rtl/ustring.hxx>
 
-
-namespace sw { namespace mark
-{
-    class CrossRefBookmark
-        : public Bookmark
-    {
+namespace sw {
+    namespace mark {
+        class CrossRefBookmark
+            : public Bookmark
+        {
         public:
             CrossRefBookmark(const SwPaM& rPaM,
                 const KeyCode& rCode,
@@ -45,7 +45,6 @@ namespace sw { namespace mark
                 const ::rtl::OUString& rShortName,
                 const ::rtl::OUString& rPrefix);
 
-            // getters
             virtual SwPosition& GetOtherMarkPos() const;
             virtual SwPosition& GetMarkStart() const
                 { return *m_pPos1; }
@@ -54,7 +53,6 @@ namespace sw { namespace mark
             virtual bool IsExpanded() const
                 { return false; }
 
-            // setters
             virtual void SetMarkPos(const SwPosition& rNewPos);
             virtual void SetOtherMarkPos(const SwPosition&)
             {
@@ -68,11 +66,11 @@ namespace sw { namespace mark
                     "<SwCrossRefBookmark::ClearOtherMarkPos(..)>"
                     " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set or cleared." );
             }
-    };
+        };
 
-    class CrossRefHeadingBookmark
-        : public CrossRefBookmark
-    {
+        class CrossRefHeadingBookmark
+            : public CrossRefBookmark
+        {
         public:
             CrossRefHeadingBookmark(const SwPaM& rPaM,
                 const KeyCode& rCode,
@@ -80,11 +78,11 @@ namespace sw { namespace mark
                 const ::rtl::OUString& rShortName);
             static ::rtl::OUString GenerateNewName();
             static bool IsLegalName(const ::rtl::OUString& rName);
-    };
+        };
 
-    class CrossRefNumItemBookmark
-        : public CrossRefBookmark
-    {
+        class CrossRefNumItemBookmark
+            : public CrossRefBookmark
+        {
         public:
             CrossRefNumItemBookmark(const SwPaM& rPaM,
                 const KeyCode& rCode,
@@ -92,9 +90,10 @@ namespace sw { namespace mark
                 const ::rtl::OUString& rShortName);
             static ::rtl::OUString GenerateNewName();
             static bool IsLegalName(const ::rtl::OUString& rName);
-    };
+        };
+    }
+}
 
-}}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index cfeead2bff49..fdeb6c9ec58b 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -77,6 +77,7 @@ class SwProtocol
     static sal_uLong nRecord;
     static SwImplProtocol* pImpl;
     static sal_Bool Start() { return 0 != ( PROT_INIT & nRecord ); }
+
 public:
     static sal_uLong Record() { return nRecord; }
     static void SetRecord( sal_uLong nNew ) { nRecord = nNew; }
@@ -91,10 +92,20 @@ class SwEnterLeave
     SwImplEnterLeave* pImpl;
     void Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar );
     void Dtor();
+
 public:
     SwEnterLeave( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar )
-        { if( SwProtocol::Record( nFunc ) ) Ctor( pFrm, nFunc, nAct, pPar ); else pImpl = NULL; }
-    ~SwEnterLeave() { if( pImpl ) Dtor(); }
+    {
+        if( SwProtocol::Record( nFunc ) )
+            Ctor( pFrm, nFunc, nAct, pPar );
+        else
+            pImpl = NULL;
+    }
+    ~SwEnterLeave()
+    {
+        if( pImpl )
+            Dtor();
+    }
 };
 
 #define PROTOCOL( pFrm, nFunc, nAct, pPar ) {   if( SwProtocol::Record( nFunc ) )\
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 721404109ed2..f7b23d965e61 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -25,17 +25,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _DFLYOBJ_HXX
 #define _DFLYOBJ_HXX
+
 #include <svx/svdovirt.hxx>
 
 class SwFlyFrm;
 class SwFrmFmt;
 class SdrObjMacroHitRec;
 
-const sal_uInt32 SWGInventor =  sal_uInt32('S')*0x00000001+
-                            sal_uInt32('W')*0x00000100+
-                            sal_uInt32('G')*0x00010000;
+const sal_uInt32 SWGInventor =  sal_uInt32('S')*0x00000001 +
+                                sal_uInt32('W')*0x00000100 +
+                                sal_uInt32('G')*0x00010000;
 
 const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001;
 const sal_uInt16 SwDrawFirst            = 0x0001;
@@ -132,7 +134,6 @@ public:
     virtual SdrObject* getFullDragClone() const;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 40f1e78394ef..850d46124c40 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -25,10 +25,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _DOCFLD_HXX
 #define _DOCFLD_HXX
 
-#include <calc.hxx>         // fuer SwHash
+#include <calc.hxx>
 
 class SwTxtFld;
 class SwIndex;
@@ -162,6 +163,7 @@ class SwDocUpdtFld
     void _MakeFldList( SwDoc& pDoc, int eGetMode );
     void GetBodyNode( const SwTxtFld& , sal_uInt16 nFldWhich );
     void GetBodyNode( const SwSectionNode&);
+
 public:
     SwDocUpdtFld();
     ~SwDocUpdtFld();
@@ -181,10 +183,9 @@ public:
     sal_Bool IsFieldsDirty() const          { return bFldsDirty; }
     void SetFieldsDirty( sal_Bool b )       { bFldsDirty = b; }
 
-    SwHash**    GetFldTypeTable() const { return (SwHash**)aFldTypeTable; }
+    SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; }
 };
 
-
-#endif  // _DOCFLD_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 0a6966d4e75f..678ebee4d38e 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -33,7 +33,6 @@
 #include <ndindex.hxx>
 #include <vector>
 
-
 class SwDoc;
 class SwTableBox;
 class SwUndoSort;
@@ -45,9 +44,15 @@ class _FndLine;
 class CollatorWrapper;
 class LocaleDataWrapper;
 
-namespace com { namespace sun { namespace star { namespace lang {
-    struct Locale;
-}}}}
+namespace com {
+    namespace sun {
+        namespace star {
+            namespace lang {
+                struct Locale;
+            }
+        }
+    }
+}
 
 // List of all sorted elements
 typedef const _FndBox*      _FndBoxPtr;
@@ -97,9 +102,8 @@ struct SwSortElement
 // sort text
 struct SwSortTxtElement : public SwSortElement
 {
-    // fuer Text
-    sal_uLong           nOrg;
-    SwNodeIndex     aPos;
+    sal_uLong   nOrg;
+    SwNodeIndex aPos;
 
     SwSortTxtElement( const SwNodeIndex& rPos );
     virtual ~SwSortTxtElement();
@@ -110,7 +114,7 @@ struct SwSortTxtElement : public SwSortElement
 // sort table
 struct SwSortBoxElement : public SwSortElement
 {
-    sal_uInt16                      nRow;
+    sal_uInt16 nRow;
 
     SwSortBoxElement( sal_uInt16 nRC );
     virtual ~SwSortBoxElement();
@@ -126,21 +130,20 @@ public:
     FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox);
     ~FlatFndBox();
 
-    sal_Bool                IsSymmetric() const { return bSym;  }
-    sal_uInt16              GetRows()     const { return nRows; }
-    sal_uInt16              GetCols()     const { return nCols; }
+    sal_Bool            IsSymmetric() const { return bSym;  }
+    sal_uInt16          GetRows()     const { return nRows; }
+    sal_uInt16          GetCols()     const { return nCols; }
 
     const _FndBox*      GetBox(sal_uInt16 nCol, sal_uInt16 nRow) const;
 
-    inline sal_Bool         HasItemSets() const;
+    inline sal_Bool     HasItemSets() const;
     const SfxItemSet*   GetItemSet(sal_uInt16 nCol, sal_uInt16 nRow) const;
 
 private:
-
-    sal_Bool                CheckLineSymmetry(const _FndBox& rBox);
-    sal_Bool                CheckBoxSymmetry(const _FndLine& rLn);
-    sal_uInt16              GetColCount(const _FndBox& rBox);
-    sal_uInt16              GetRowCount(const _FndBox& rBox);
+    sal_Bool            CheckLineSymmetry(const _FndBox& rBox);
+    sal_Bool            CheckBoxSymmetry(const _FndLine& rLn);
+    sal_uInt16          GetColCount(const _FndBox& rBox);
+    sal_uInt16          GetRowCount(const _FndBox& rBox);
     void                FillFlat(const _FndBox&, sal_Bool bLastBox=sal_False);
 
     SwDoc*              pDoc;
@@ -148,18 +151,16 @@ private:
     _FndBoxPtr*         pArr;
     SfxItemSet**        ppItemSets;
 
-    sal_uInt16              nRows;
-    sal_uInt16              nCols;
+    sal_uInt16          nRows;
+    sal_uInt16          nCols;
+    sal_uInt16          nRow;
+    sal_uInt16          nCol;
 
-    sal_uInt16              nRow;
-    sal_uInt16              nCol;
-
-    sal_Bool                bSym;
+    sal_Bool            bSym;
 };
 
-
 inline sal_Bool FlatFndBox::HasItemSets() const { return 0 != ppItemSets; }
 
-#endif // _NDSORT_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 0c2b6a575551..c3b0ee77e0d6 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _DOCTXM_HXX
 #define _DOCTXM_HXX
 
@@ -47,22 +48,22 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
 {
     SwTOXSortTabBases aSortArr;
 
-    void    UpdateMarks( const SwTOXInternational& rIntl,
-                            const SwTxtNode* pOwnChapterNode );
-    void    UpdateOutline( const SwTxtNode* pOwnChapterNode );
-    void    UpdateTemplate( const SwTxtNode* pOwnChapterNode );
-    void    UpdateCntnt( SwTOXElement eType,
-                            const SwTxtNode* pOwnChapterNode );
-    void    UpdateTable( const SwTxtNode* pOwnChapterNode );
-    void    UpdateSequence( const SwTxtNode* pOwnChapterNode );
-    void    UpdateAuthorities( const SwTOXInternational& rIntl );
-    void    UpdateAll();
+    void UpdateMarks( const SwTOXInternational& rIntl,
+                      const SwTxtNode* pOwnChapterNode );
+    void UpdateOutline( const SwTxtNode* pOwnChapterNode );
+    void UpdateTemplate( const SwTxtNode* pOwnChapterNode );
+    void UpdateCntnt( SwTOXElement eType,
+                      const SwTxtNode* pOwnChapterNode );
+    void UpdateTable( const SwTxtNode* pOwnChapterNode );
+    void UpdateSequence( const SwTxtNode* pOwnChapterNode );
+    void UpdateAuthorities( const SwTOXInternational& rIntl );
+    void UpdateAll();
 
     // insert sorted into array for creation
-    void    InsertSorted(SwTOXSortTabBase* pBase);
+    void InsertSorted(SwTOXSortTabBase* pBase);
 
     // insert alpha delimiter at creation
-    void    InsertAlphaDelimitter( const SwTOXInternational& rIntl );
+    void InsertAlphaDelimitter( const SwTOXInternational& rIntl );
 
     // generate text body
     void GenerateText( sal_uInt16 nArrayIdx,
@@ -71,11 +72,11 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
                        const SwPageDesc*  _pDefaultPageDesc );
 
     // replace page num placeholder with actual page number
-    void    _UpdatePageNum( SwTxtNode* pNd,
-                            const std::vector<sal_uInt16>& rNums,
-                            const SvPtrarr &rDescs,
-                            const std::vector<sal_uInt16>* pMainEntryNums,
-                            const SwTOXInternational& rIntl );
+    void _UpdatePageNum( SwTxtNode* pNd,
+                         const std::vector<sal_uInt16>& rNums,
+                         const SvPtrarr &rDescs,
+                         const std::vector<sal_uInt16>* pMainEntryNums,
+                         const SwTOXInternational& rIntl );
 
     // get section for entering keywords
     Range GetKeyRange( const String& rStr, const String& rStrReading,
@@ -117,7 +118,8 @@ struct SwDefTOXBase_Impl
     pObjBase(0),
     pIllBase(0),
     pAuthBase(0)
-    {}
+    {
+    }
     ~SwDefTOXBase_Impl()
     {
         delete pContBase;
@@ -131,6 +133,6 @@ struct SwDefTOXBase_Impl
 
 };
 
-#endif  // _DOCTXM_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx
index 319d6a8c379a..22383d822e94 100644
--- a/sw/source/core/inc/drawdev.hxx
+++ b/sw/source/core/inc/drawdev.hxx
@@ -62,7 +62,7 @@ public:
                           const sal_uInt16 nHorzRount = 0,
                           const sal_uInt16 nVertRound = 0 );
 
-    inline const Point *GetOrigin() const {return pPos; }
+    inline const Point *GetOrigin() const { return pPos; }
 };
 
 // implementation
@@ -110,7 +110,6 @@ inline void SwDrawDev::DrawRect( const SwRect& rRect,
     pOut->DrawRect( aRect.SVRect(), nHorzRound, nVertRound );
 }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index c74dfa9e322f..dad1c060d2a9 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _DRAWFONT_HXX
 #define _DRAWFONT_HXX
 
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index b2472c440083..1a6dc5ce4b29 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -52,7 +52,6 @@ namespace sw {
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc;
 
-
     public:
        LayoutDumpFilter();
        virtual ~LayoutDumpFilter();
@@ -80,7 +79,7 @@ namespace sw {
             throw (::com::sun::star::uno::RuntimeException);
 
     };
-} // Namespace sw
+}
 
 #endif
 
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 7155a47080da..67d457d07697 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -28,7 +28,6 @@
 #ifndef _DVIEW_HXX
 #define _DVIEW_HXX
 
-
 #include <svx/fmview.hxx>
 
 class OutputDevice;
@@ -120,7 +119,6 @@ public:
     static void ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView );
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */