Remove visual noise from sw

Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx

Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

42 files changed, 7 insertions, 102 deletions

diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index f086908290c3..549d06b016a0 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -51,7 +51,6 @@ namespace sw {
                 const SwPaM& rPaM,
                 const ::rtl::OUString& rName );
 
-
             virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
             virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName);
             virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset);
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index 4cfb8543c7d0..e910ecba3e8c 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -58,7 +58,6 @@ public:
     virtual SwRewriter GetRewriter() const;
 };
 
-
 class SwUndoInsBookmark : public SwUndoBookmark
 {
 public:
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 4c30e00a7e03..8cc86427d771 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -77,7 +77,6 @@ public:
 // Blink-Manager, global variable, see Blink.Cxx
 extern SwBlink *pBlink;
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 060bd89f11f8..234e94d5dae3 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -206,7 +206,6 @@ public:
     sal_Bool IsLockDeleteContent()  const { return bLockDeleteContent; }
     void SetLockDeleteContent( sal_Bool bNew ) { bLockDeleteContent = bNew; }
 
-
     sal_Bool IsClipped()        const   { return bHeightClipped || bWidthClipped; }
     sal_Bool IsHeightClipped()  const   { return bHeightClipped; }
     sal_Bool IsWidthClipped()   const   { return bWidthClipped;  }
@@ -224,7 +223,6 @@ public:
     sal_Bool GetContour( PolyPolygon&   rContour,
                      const sal_Bool _bForPaint = sal_False ) const;
 
-
     // Paint on this shell (consider Preview, print flag, etc. recursively)?
     static sal_Bool IsPaint( SdrObject *pObj, const SwViewShell *pSh );
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index ae8684b85065..c78614ab2c5e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1141,7 +1141,6 @@ inline const SwFrm *SwFrm::FindPrev() const
         return ((SwFrm*)this)->_FindPrev();
 }
 
-
 inline bool SwFrm::IsLayoutFrm() const
 {
     return GetType() & FRM_LAYOUT;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 341af85e1146..a56db5fa4284 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -242,7 +242,7 @@ public:
 
 // SwBorderAttrs encapsulates the calculation for margin attributes including
 // border. The whole class is cached.
-//
+
 // WARNING! If more attributes should be cached also adjust the method
 //          Modify::Modify!
 class SwBorderAttrs : public SwCacheObj
@@ -533,7 +533,6 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm,
 
 const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ );
 
-
 /** helper class to check if a frame has been deleted during an operation
  *  WARNING! This should only be used as a last and desperate means to make the
  *  code robust.
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 83f118e60ffb..b778d67a2155 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -34,16 +34,15 @@ class SwWait;
 class SfxProgress;
 
 // The usage of LayAction is always the same:
-//
+
 // 1. Generation of the LayAction object.
 // 2. Specifying the wanted bahaviour via the Set-methods
 // 3. Calling Action()
 // 4. Soon after that the destruction of the object
-//
+
 // Das Objekt meldet sich im CTor beim SwViewImp an und erst im DTor
 // wieder ab! Es handelt sich mithin um ein typisches Stackobjekt.
 
-
 class SwLayAction
 {
     SwRootFrm  *pRoot;
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 7bc2974e5803..c162bf1dcdee 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -77,7 +77,6 @@ public:
     void ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
         const sal_Bool bChgFtn = sal_False );
 
-
         //Painted die Column-Trennlinien fuer die innenliegenden Columns.
     void PaintColLines( const SwRect &, const SwFmtCol &,
                         const SwPageFrm * ) const;
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 2454d2df7187..1bc4b6b09114 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -138,10 +138,8 @@ public:
     static void ClearMoveBwdLayoutInfo( const SwDoc& p_rDoc );
 };
 
-
 extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm );
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index 8683d68f69fc..c1d83d9f9e20 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -31,7 +31,6 @@ typedef std::map< const SwTxtNode*, const sal_uInt32 > NodeMap;
 typedef std::map< const SwTxtNode*, const sal_uInt32 >::const_iterator NodeMapIter;
 typedef NodeMap::value_type NodeMapEntry;
 
-
 class SwMovedFwdFrmsByObjPos
 {
     private:
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index b86726a13ae7..1c84b86987b7 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -88,7 +88,6 @@ void _RestoreCntntIdx( SwDoc* pDoc, std::vector<sal_uLong>& rSaveArr,
 void _RestoreCntntIdx( std::vector<sal_uLong>& rSaveArr, const SwNode& rNd,
                         sal_Int32 nLen, sal_Int32 nCorrLen );
 
-
 /** data structure to temporarily hold fly anchor positions relative to some
  *  location. */
 struct _SaveFly
@@ -113,7 +112,6 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
 void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
                     const SwNodeIndex& rPtNdIdx );
 
-
 class SwDataChanged
 {
     const SwPaM* pPam;
@@ -131,7 +129,6 @@ public:
     sal_Int32 GetCntnt() const { return nCntnt; }
 };
 
-
 // Funktions-Deklaration damit auch alles unter der CrsrShell mal die
 // Crsr verschieben kann
 // die Funktionen rufen nicht die SwDoc::Corr - Methoden!
@@ -145,7 +142,6 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
                  const SwPosition &rNewPos,
                  const sal_Int32 nOffset = 0 );
 
-
 // Hilfsklasse zum kopieren von absatzgebundenen Flys. Durch die Sortierung
 // nach der Ordnungsnummer wird versucht die layout seitige Anordnung
 // bei zu behalten
@@ -172,7 +168,6 @@ public:
     const SwFmtAnchor* GetAnchor() const        { return pAnchor; }
 };
 
-
 class SwTblNumFmtMerge
 {
     SvNumberFormatter* pNFmt;
@@ -181,7 +176,6 @@ public:
     ~SwTblNumFmtMerge();
 };
 
-
 class _SaveRedlEndPosForRestore
 {
     std::vector<SwPosition*>* pSavArr;
@@ -195,7 +189,6 @@ public:
     void Restore() { if( pSavArr ) _Restore(); }
 };
 
-
 #endif // INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 734f0c1796fa..2a2f7671578f 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -60,7 +60,6 @@ public:
 // globale Variable, in NoteURL.Cxx angelegt
 extern SwNoteURL *pNoteURL;
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index fc5964c46885..f6967599f2c4 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -31,11 +31,10 @@ class SwLayAction;
 // OD 2004-10-04 #i26945#
 class SwPageNumAndTypeOfAnchors;
 
-// -----------------------------------------------------------------------------
 // #i28701#
 // Format floating screen objects, which are anchored at the given anchor frame
 // and registered at the given page frame.
-// -----------------------------------------------------------------------------
+
 class SwObjectFormatter
 {
     private:
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 35e164690cb6..67e3e508e8fc 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -438,8 +438,6 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const
 #define GETGRIDWIDTH( pGrid , pDoc )  pDoc->IsSquaredPageMode() ? \
     pGrid->GetBaseHeight(): pGrid->GetBaseWidth()
 
-
-
 #endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 0d4db6f469d0..adb659025c26 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -58,7 +58,6 @@ sal_Bool GoPrevSection( SwPaM&, SwPosSection);
 sal_Bool GoCurrSection( SwPaM&, SwPosSection);
 sal_Bool GoNextSection( SwPaM&, SwPosSection);
 
-
 // ------------ Typedefiniton fuer Funktionen ----------------------
 
 typedef sal_Bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
@@ -71,7 +70,6 @@ typedef bool (utl::TextSearch:: *SearchTxt)( const OUString&, sal_Int32*,
                     sal_Int32*, ::com::sun::star::util::SearchResult* );
 typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const;
 
-
 struct SwMoveFnCollection
 {
     GoNd      fnNd;
@@ -87,8 +85,6 @@ struct SwMoveFnCollection
 // --------- Funktionsdefinitionen fuers Suchen --------------
 SwCntntNode* GetNode( SwPaM&, sal_Bool&, SwMoveFn, sal_Bool bInReadOnly = sal_False );
 
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 43dcf284e30a..227be352bdb3 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -322,7 +322,6 @@ public:
     bool IsInDelList( SwSectionFrm* pSct ) const;
 #endif
 
-
     void SetCallbackActionEnabled( sal_Bool b ) { bCallbackActionEnabled = b; }
     sal_Bool IsCallbackActionEnabled() const    { return bCallbackActionEnabled; }
 
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 2983e4561559..62beae41b38c 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -66,8 +66,6 @@ public:
     //wenn die Direction nicht der Hoehe entspricht.
     void AdjustCells( const SwTwips nHeight, const sal_Bool bHeight );
 
-    //
-    //
     SwRowFrm* GetFollowRow() const { return pFollowRow; }
     void SetFollowRow( SwRowFrm* pNew ) { pFollowRow = pNew; }
 
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 03aef3c9da80..49842c9da413 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -187,9 +187,7 @@ public:
     sal_uInt8 CompType( const sal_Int32 nPos ) const;
 #endif
 
-    //
     // HIDDEN TEXT STUFF START
-    //
 
 /** Hidden text range information - static and non-version
 
@@ -251,9 +249,7 @@ public:
  */
     static void DeleteHiddenRanges( SwTxtNode& rNode );
 
-    //
     // HIDDEN TEXT STUFF END
-    //
 
     // examines the range [ nStart, nStart + nEnd ] if there are kanas
     // returns start index of kana entry in array, otherwise USHRT_MAX
@@ -312,8 +308,6 @@ public:
     sal_Int32 GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
        sal_Int32* pKashidaPosition);
 
-
-
 /** Use regular blank justification instead of kashdida justification for the given line of text.
    nStt Start char index of the line referring to the paragraph.
    nLen Number of characters in the line
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index f8a793971fe5..b15b75346e29 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -160,7 +160,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const
     return ((SwSectionFrm*)this)->FindLastCntnt( nMode );
 }
 
-
 #endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx
index 00ba6fca2ff9..d7d8c902a95f 100644
--- a/sw/source/core/inc/setmapvirtdev.hxx
+++ b/sw/source/core/inc/setmapvirtdev.hxx
@@ -56,7 +56,6 @@ void SetMappingForVirtDev(  const Point&    _rNewOrigin,
                             const OutputDevice* _pOrgOutDev,
                             VirtualDevice*  _pVirDev );
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 840485c40990..b07ca6796756 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -22,7 +22,6 @@
 #include <tools/datetime.hxx>
 #include <o3tl/sorted_vector.hxx>
 
-
 class SwPaM;
 class SwDoc;
 class SvxMacroTableDtor;
@@ -51,7 +50,6 @@ public:
 
 class SwBlockNames : public o3tl::sorted_vector<SwBlockName*, o3tl::less_ptr_to<SwBlockName> > {};
 
-
 class SwImpBlocks
 {
     friend class SwTextBlocks;
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 5da48343b1e3..7b2ea25953b7 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -68,7 +68,6 @@ class SwCache
 
           sal_uInt16 nCurMax;           //Mehr werden nicht aufgenommen.
 
-
     void DeleteObj( SwCacheObj *pObj );
 
 #ifdef DBG_UTIL
@@ -280,7 +279,6 @@ inline SwCacheObj *SwCacheAccess::Get()
     return pObj;
 }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 1169f9455e5e..07ef171962b6 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -76,7 +76,6 @@ public:
  *                      class SwFontAccess
  *************************************************************************/
 
-
 class SwFontAccess : public SwCacheAccess
 {
     SwViewShell *pShell;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 7a3d81468ee0..c11a29a86909 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -38,7 +38,7 @@ class SwViewShell;
 class IDocumentSettingAccess;
 
 const sal_Unicode CH_BLANK = ' ';   // ' ' blank spaces
-const sal_Unicode CH_BREAK = 0x0A;  //
+const sal_Unicode CH_BREAK = 0x0A;
 const sal_Unicode CH_TAB   = '\t';  // \t
 const sal_Unicode CH_PAR    = 0xB6;     // paragraph
 const sal_Unicode CH_BULLET = 0xB7;     // centered dot
@@ -464,7 +464,6 @@ inline void SwSubFont::SetColor( const Color& rColor )
     Font::SetColor( rColor );
 }
 
-
 // encapsulated SV-Font-method
 inline void SwSubFont::SetFillColor( const Color& rColor )
 {
@@ -1044,7 +1043,6 @@ public:
     void SetPos( const Point& rPoint ) { aPos = rPoint;  }
 };
 
-
 /*************************************************************************
  *                      class SvStatistics
  *************************************************************************/
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index e4c332287e1c..9ac208008004 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -26,7 +26,6 @@
 #include <boost/utility.hpp>
 #include <memory>
 
-
 class ObservableThread;
 class ThreadManager;
 
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 93984274a532..7d8c15ad2cab 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -148,9 +148,8 @@ public:
     void SetResizeHTMLTable()   { bResizeHTMLTable = sal_True; } // same
     void SetONECalcLowers()     { bONECalcLowers = sal_True;   }
 
-    //
     // Start: New stuff for breaking table rows
-    //
+
     sal_Bool HasFollowFlowLine() const { return bHasFollowFlowLine; }
     void SetFollowFlowLine( sal_Bool bNew ) { bHasFollowFlowLine = bNew; }
     //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for
@@ -195,9 +194,8 @@ public:
     }
 
     bool RemoveFollowFlowLine();
-    //
+
     // End: New stuff for breaking table rows
-    //
 
     sal_Bool CalcFlyOffsets(
         SwTwips& rUpper,
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 5d2a701e24e9..8e243cd8cf72 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -41,7 +41,6 @@ struct _InsULPara;
 
 void sw_LineSetHeadCondColl( const SwTableLine* pLine );
 
-
 #ifdef DBG_UTIL
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 #endif
@@ -146,7 +145,6 @@ public:
 
 void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara );
 
-
 class SwShareBoxFmt
 {
     const SwFrmFmt* pOldFmt;
@@ -166,7 +164,6 @@ public:
     bool RemoveFormat( const SwFrmFmt& rFmt );
 };
 
-
 typedef boost::ptr_vector<SwShareBoxFmt> _SwShareBoxFmts;
 
 class SwShareBoxFmts
@@ -192,8 +189,6 @@ public:
     void RemoveFormat( const SwFrmFmt& rFmt );
 };
 
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 68cff5faaf0d..7d44dd70b54e 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -140,7 +140,6 @@ class ThreadManager : public IThreadListenerOwner
             }
         };
 
-
         inline oslInterlockedCount RetrieveNewThreadID()
         {
             return osl_atomic_increment( &mnThreadIDCounter );
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 3021f1bbd703..ed11c7e2d30d 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/lang/Locale.hpp>
 
-
 class CharClass;
 class SwCntntNode;
 class SwTxtNode;
@@ -57,7 +56,6 @@ struct SwTOXSource
 
 typedef std::vector<SwTOXSource> SwTOXSources;
 
-
 struct TextAndReading
 {
     OUString sText;
@@ -71,7 +69,6 @@ struct TextAndReading
     {}
 };
 
-
 class SwTOXInternational
 {
     IndexEntrySupplierWrapper* pIndexWrapper;
@@ -188,7 +185,6 @@ struct SwTOXIndex : public SwTOXSortTabBase
                 const ::com::sun::star::lang::Locale& rLocale );
     virtual ~SwTOXIndex() {}
 
-
     virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const;
     virtual sal_uInt16  GetLevel() const;
     virtual bool    operator==( const SwTOXSortTabBase& );
@@ -291,7 +287,6 @@ public:
     virtual sal_uInt16  GetLevel() const;
 };
 
-
 #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9a6c8c27ca18..b23ba02b91f1 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -78,7 +78,6 @@ class SwTxtFrm: public SwCntntFrm
     // It is NOT used for the determination of printing area.
     SwTwips mnAdditionalFirstLineOffset;
 
-
     sal_Int32 nOfst;           //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an.
 
     sal_uInt16 nCacheIdx;           //Index in den Cache, USHRT_MAX wenn definitiv
@@ -258,7 +257,6 @@ public:
 
     virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
 
-
     //Liefert in nOffset den Offset des Characters innerhalb des
     //gesetzten Textbuffers zurueck, welcher der durch aPoint
     //gegebenen Position innerhalb der SSize des Layout am
@@ -504,7 +502,6 @@ public:
     // Ermittelt die Startposition und Schrittweite des Registers
     bool FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff );
 
-
     sal_uInt16 GetLineCount( sal_Int32 nPos );     //Ermittelt die Zeilenanzahl
 
     //Fuer die Anzeige der Zeilennummern.
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index f88a94ab2f2a..639f6b6d7c67 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -34,10 +34,8 @@
 #include <unobaseclass.hxx>
 #include <IDocumentMarkAccess.hxx>
 
-
 class SwDoc;
 
-
 typedef ::cppu::ImplInheritanceHelper5
 <   ::sfx2::MetadatableMixin
 ,   ::com::sun::star::lang::XUnoTunnel
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 0fcd86fb9333..569710eb06ac 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -22,7 +22,6 @@
 #include <svtools/unoevent.hxx>
 #include <svl/macitem.hxx>
 
-
 class SvxMacroItem;
 class SvxMacro;
 class SwXFrame;
@@ -32,8 +31,6 @@ class SwXTextEmbeddedObject;
 class SwXFrameStyle;
 class SwFmtINetFmt;
 
-
-
 class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
 {
     const OUString sImplName;
@@ -47,8 +44,6 @@ public:
 
      SwHyperlinkEventDescriptor();
 
-
-
     void copyMacrosFromINetFmt(const SwFmtINetFmt& aFmt);
     void copyMacrosIntoINetFmt(SwFmtINetFmt& aFmt);
 
@@ -57,8 +52,6 @@ public:
             ::com::sun::star::container::XNameReplace> & xReplace);
 };
 
-
-
 // SwEventDescriptor for
 // 1) SwXTextFrame
 // 2) SwXGraphicObject
@@ -106,7 +99,6 @@ protected:
     virtual sal_uInt16 getMacroItemWhich() const;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index d9a04c0721a5..0065c2529ce4 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -32,7 +32,6 @@
 
 #include <unobaseclass.hxx>
 
-
 class SwFieldType;
 class SwDoc;
 class SwFmtFld;
@@ -151,7 +150,6 @@ public:
 
 };
 
-
 typedef ::cppu::WeakImplHelper5
 <   ::com::sun::star::text::XDependentTextField
 ,   ::com::sun::star::lang::XServiceInfo
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index a62b22be373f..537ca3a4317a 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -31,7 +31,6 @@
 
 #include <unotext.hxx>
 
-
 class SwDoc;
 class SwModify;
 class SwFmtFtn;
@@ -56,7 +55,6 @@ private:
     class Impl;
     ::sw::UnoImplPtr<Impl> m_pImpl;
 
-
 protected:
 
     virtual const SwStartNode *GetStartNode() const;
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index e92395e7115e..0be41286f40a 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -35,7 +35,6 @@
 #include <toxe.hxx>
 #include <unobaseclass.hxx>
 
-
 class SwDoc;
 class SwTOXBaseSection;
 class SwTOXMark;
@@ -185,7 +184,6 @@ public:
                 ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
         throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-
     // XDocumentIndex
     virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index d7fd7f831858..2d343de927bc 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -37,7 +37,6 @@
 
 #include <unobaseclass.hxx>
 
-
 typedef ::std::deque<
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
     TextRangeList_t;
@@ -233,7 +232,6 @@ public:
 
 };
 
-
 typedef ::cppu::ImplInheritanceHelper2
 <   SwXMeta
 ,   ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index 7dea474b7420..953ee5589e96 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -32,13 +32,11 @@
 
 #include <unobaseclass.hxx>
 
-
 class SwDepend;
 class SwNodeIndex;
 class SwPaM;
 class SwFrmFmt;
 
-
 struct FrameDependSortListEntry
 {
     sal_Int32 nIndex;
@@ -56,7 +54,6 @@ typedef ::std::deque< FrameDependSortListEntry >
 typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
     FrameDependList_t;
 
-
 // #i28701# - adjust 4th parameter
 void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
                          FrameDependSortList_t & rFrames,
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index a29b765fb554..fcaf6434dfe7 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -44,13 +44,11 @@
 #include <calbck.hxx>
 #include <unobaseclass.hxx>
 
-
 class SwFmtFld;
 class SwFrmFmt;
 class SwRangeRedline;
 class SwTxtRuby;
 
-
 typedef ::std::deque<
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
     TextRangeList_t;
@@ -80,7 +78,6 @@ enum SwTextPortionType
     PORTION_ANNOTATION_END
 };
 
-
 class SwXTextPortion : public cppu::WeakImplHelper8
 <
     ::com::sun::star::beans::XTolerantMultiPropertySet,
@@ -282,7 +279,6 @@ public:
     SwXTextPortionEnumeration(SwPaM& rParaCrsr,
         TextRangeList_t const & rPortions );
 
-
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index e33fe1b05328..8f5360e3bf78 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -30,7 +30,6 @@
 
 #include <unobaseclass.hxx>
 
-
 class SwDoc;
 class SwModify;
 class SwFmtRefMark;
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 7c97d1031522..017db44dd49d 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -35,11 +35,8 @@
 
 #include <unobaseclass.hxx>
 
-
 class SwSectionFmt;
 
-
-
 struct SwTextSectionProperties_Impl;
 
 typedef ::cppu::ImplInheritanceHelper7
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index a4b1d89d8911..96980afef814 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { namespace text {
     class XTextRange;
 } } } }
 
-
 class SwTxtNode;
 class SfxPoolItem;
 
@@ -79,7 +78,6 @@ protected:
     const ModelToViewHelper maConversionMap;
 };
 
-
 /** Implementation of the ::com::sun::star::container::XStringKeyMap interface
  */
 class SwXStringKeyMap:
@@ -108,5 +106,4 @@ private:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 4a7604cbbfe7..89d6c0bac095 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -52,7 +52,6 @@ enum WrongListType
     WRONGLIST_CHANGETRACKING
 };
 
-
 // ST2
 class SwWrongArea
 {