fdo#62475 - remove visual noise

This is a follow up commit to
- 22d1beb78a475e4846af945afde1c4d6c263b5d6
- 1c7af455ab9345304a7ac48ce2e0310de2ac8a75

Change-Id: I102685391125f3b4f7bdf838f8bd17a2283d558d

10 files changed, 93 insertions, 120 deletions

diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 61fdabe99e6b..e2f3bae339f4 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -69,7 +69,6 @@ using namespace ::com::sun::star;
 /************************************************************************
  * Hintergrundbrush setzen, z.B. bei Zeichenvorlagen
  ***********************************************************************/
-
 void SwFont::SetBackColor( Color* pNewColor )
 {
     delete pBackColor;
@@ -468,10 +467,6 @@ void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat )
 
 *************************************************************************/
 
-/*************************************************************************
- *                  SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent )
- *************************************************************************/
-
 // nEsc ist der Prozentwert
 sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
 {
@@ -486,10 +481,6 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
     return nOrgAscent;
 }
 
-/*************************************************************************
- *                      SwFont::SetDiffFnt()
- *************************************************************************/
-
 void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
                          const IDocumentSettingAccess *pIDocumentSettingAccess )
 {
@@ -712,9 +703,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
     OSL_ENSURE( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" );
 }
 
-/*************************************************************************
- *                      class SwFont
- *************************************************************************/
+// SwFont
 
 SwFont::SwFont()
     : pBackColor(0)
@@ -975,30 +964,18 @@ SwFont& SwFont::operator=( const SwFont &rFont )
     return *this;
 }
 
-/*************************************************************************
- *                      SwFont::GoMagic()
- *************************************************************************/
-
 void SwFont::GoMagic( ViewShell *pSh, sal_uInt8 nWhich )
 {
     SwFntAccess aFntAccess( aSub[nWhich].pMagic, aSub[nWhich].nFntIndex,
                             &aSub[nWhich], pSh, sal_True );
 }
 
-/*************************************************************************
- *                      SwSubFont::IsSymbol()
- *************************************************************************/
-
 sal_Bool SwSubFont::IsSymbol( ViewShell *pSh )
 {
     SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, sal_False );
     return aFntAccess.Get()->IsSymbol();
 }
 
-/*************************************************************************
- *                      SwSubFont::ChgFnt()
- *************************************************************************/
-
 sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut )
 {
     if ( pLastFont )
@@ -1016,10 +993,6 @@ sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut )
            STRIKEOUT_NONE != GetStrikeout();
 }
 
-/*************************************************************************
- *                    SwFont::ChgPhysFnt()
- *************************************************************************/
-
 void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut )
 {
     if( bOrgChg && aSub[nActual].IsEsc() )
@@ -1053,7 +1026,6 @@ void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut )
  *     MaxDescent = Max (T1_height-T1_ascent,
  *                       T2_height-T2_ascent - (Esc * T1_height)
  *************************************************************************/
-
 sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight,
                               const sal_uInt16 nOldAscent  ) const
 {
@@ -1078,10 +1050,6 @@ short SwSubFont::_CheckKerning( )
     return nKernx;
 }
 
-/*************************************************************************
- *                    SwSubFont::GetAscent()
- *************************************************************************/
-
 sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut )
 {
     sal_uInt16 nAscent;
@@ -1092,10 +1060,6 @@ sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut )
     return nAscent;
 }
 
-/*************************************************************************
- *                    SwSubFont::GetHeight()
- *************************************************************************/
-
 sal_uInt16 SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut )
 {
     SV_STAT( nGetTextSize );
@@ -1109,9 +1073,6 @@ sal_uInt16 SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut )
     return nHeight; // + nLeading;
 }
 
-/*************************************************************************
- *                    SwSubFont::_GetTxtSize()
- *************************************************************************/
 Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
 {
     // Robust: Eigentlich sollte der Font bereits eingestellt sein, aber
@@ -1211,10 +1172,6 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
     return aTxtSize;
 }
 
-/*************************************************************************
- *                    SwSubFont::_DrawText()
- *************************************************************************/
-
 void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey )
 {
     rInf.SetGreyWave( bGrey );
@@ -1431,10 +1388,6 @@ static sal_Char const sDoubleSpace[] = "  ";
     rInf.SetPos( rOld );
 }
 
-/*************************************************************************
- *                    SwSubFont::_GetCrsrOfst()
- *************************************************************************/
-
 xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
 {
     if ( !pLastFont || pLastFont->GetOwner()!=pMagic )
@@ -1468,10 +1421,6 @@ xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
     return nCrsr;
 }
 
-/*************************************************************************
- *                    SwSubFont::CalcEsc()
- *************************************************************************/
-
 void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos )
 {
     long nOfst;
@@ -1570,12 +1519,9 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir )
     }
 }
 
-/*************************************************************************
- *                      SwUnderlineFont::~SwUnderlineFont
- *
- * Used for the "continuous underline" feature.
- *************************************************************************/
-
+/**
+ * @note Used for the "continuous underline" feature.
+ **/
 SwUnderlineFont::SwUnderlineFont( SwFont& rFnt, const Point& rPoint )
         : aPos( rPoint ), pFnt( &rFnt )
 {
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index b830f517af1b..0f5dd17cccb4 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itemiter.hxx>
@@ -141,7 +140,6 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
 /*
  * Used for spell checking. Deleted redlines and hidden characters are masked
  */
-
 static sal_uInt16
 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
                                       const xub_StrLen nStt, const xub_StrLen nEnd,
@@ -177,7 +175,6 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
 /*
  * Used for spell checking. Calculates a rectangle for repaint.
  */
-
 static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart, xub_StrLen nChgEnd )
 {
     SwRect aRect;
@@ -370,7 +367,6 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
  * 5) The attribute is outside the deletion range
  *    -> nothing to do
  */
-
 void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich,
                         const SfxItemSet* pSet, sal_Bool bInclRefToxMark )
 {
@@ -614,7 +610,6 @@ sal_Int32 clipIndexBounds(const OUString &rStr, sal_Int32 nPos)
  * Wenn dieses erste Wort nur aus Whitespaces besteht, returnen wir
  * einen leeren String.
  *************************************************************************/
-
 OUString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
 {
     assert(nPos <= m_Text.getLength()); // invalid index
@@ -1475,18 +1470,14 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
 
     if( pSmartTagList )
     {
-        //
         // Update WrongList stuff
-        //
         pSmartTagList->SetInvalid( STRING_LEN, 0 );
         pNode->SetSmartTagDirty( STRING_LEN != pSmartTagList->GetBeginInv() );
 
         if( !pSmartTagList->Count() && !pNode->IsSmartTagDirty() )
             pNode->SetSmartTags( NULL );
 
-        //
         // Calculate repaint area:
-        //
 #if OSL_DEBUG_LEVEL > 1
         const sal_uInt16 nNumberOfEntriesAfterRecognize2 = pSmartTagList->Count();
         (void) nNumberOfEntriesAfterRecognize2;
@@ -1553,11 +1544,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, xub_StrLen nActPos )
         pNode->SetAutoCompleteWordDirty( sal_False );
 }
 
-/*************************************************************************
- *                      SwTxtNode::Hyphenate
- *************************************************************************/
-// Findet den TxtFrm und sucht dessen CalcHyph
-
+/** Findet den TxtFrm und sucht dessen CalcHyph */
 sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
     // Abkuerzung: am Absatz ist keine Sprache eingestellt:
@@ -2066,9 +2053,8 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
     return true;
 }
 
-//
-// Paragraph statistics start
-//
+// Paragraph statistics start -->
+
 struct SwParaIdleData_Impl
 {
     SwWrongList* pWrong;                // for spell checking
@@ -2239,6 +2225,7 @@ bool SwTxtNode::IsWordCountDirty() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bWordCountDirty : 0;
 }
+
 void SwTxtNode::SetWrongDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
@@ -2246,10 +2233,12 @@ void SwTxtNode::SetWrongDirty( bool bNew ) const
         m_pParaIdleData_Impl->bWrongDirty = bNew;
     }
 }
+
 bool SwTxtNode::IsWrongDirty() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bWrongDirty : 0;
 }
+
 void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
@@ -2257,10 +2246,12 @@ void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const
         m_pParaIdleData_Impl->bGrammarCheckDirty = bNew;
     }
 }
+
 bool SwTxtNode::IsGrammarCheckDirty() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bGrammarCheckDirty : 0;
 }
+
 void SwTxtNode::SetSmartTagDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
@@ -2268,10 +2259,12 @@ void SwTxtNode::SetSmartTagDirty( bool bNew ) const
         m_pParaIdleData_Impl->bSmartTagDirty = bNew;
     }
 }
+
 bool SwTxtNode::IsSmartTagDirty() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bSmartTagDirty : 0;
 }
+
 void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
@@ -2279,12 +2272,12 @@ void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const
         m_pParaIdleData_Impl->bAutoComplDirty = bNew;
     }
 }
+
 bool SwTxtNode::IsAutoCompleteWordDirty() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->bAutoComplDirty : 0;
 }
-//
-// Paragraph statistics end
-//
+
+// <-- Paragraph statistics end
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 16f10e85238b..73989d5c4b28 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -74,7 +74,6 @@
 #include "swhtml.hxx"
 #include "htmlform.hxx"
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -171,7 +170,6 @@ const sal_Char * aEventOptionTable[] =
     0
 };
 
-
 class SwHTMLForm_Impl
 {
     SwDocShell                  *pDocSh;
@@ -198,7 +196,6 @@ class SwHTMLForm_Impl
     std::vector<sal_uInt16>     aSelectedList;
 
 public:
-
     SwHTMLForm_Impl( SwDocShell *pDSh ) :
         pDocSh( pDSh ),
         pHeaderAttrs( pDSh ? pDSh->GetHeaderAttributes() : 0 )
@@ -278,7 +275,6 @@ const uno::Reference< XMultiServiceFactory >& SwHTMLForm_Impl::GetServiceFactory
     return xServiceFactory;
 }
 
-
 const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
 {
     if( !xDrawPage.is() && pDocSh )
@@ -315,7 +311,6 @@ const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms()
     return xForms;
 }
 
-
 const uno::Reference< drawing::XShapes > & SwHTMLForm_Impl::GetShapes()
 {
     if( !xShapes.is() )
@@ -375,7 +370,6 @@ class SwHTMLImageWatcher :
     void clear();
 
 public:
-
     SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape,
                         sal_Bool bWidth, sal_Bool bHeight );
     ~SwHTMLImageWatcher();
@@ -458,8 +452,6 @@ void SwHTMLImageWatcher::clear()
         xProd->removeConsumer( xThis );
 }
 
-//------------------------------------------------------------------------------
-
 void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
     throw( uno::RuntimeException )
 {
@@ -573,7 +565,6 @@ void SwHTMLImageWatcher::setPixelsByBytes(
 {
 }
 
-
 void SwHTMLImageWatcher::setPixelsByLongs(
         sal_Int32, sal_Int32, sal_Int32, sal_Int32,
         const Sequence< sal_Int32 >&, sal_Int32, sal_Int32 )
@@ -581,7 +572,6 @@ void SwHTMLImageWatcher::setPixelsByLongs(
 {
 }
 
-
 void SwHTMLImageWatcher::complete( sal_Int32 Status,
         const uno::Reference< awt::XImageProducer >& )
     throw( uno::RuntimeException )
@@ -652,7 +642,6 @@ class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
     sal_Bool        bMinHeight;
 
 public:
-
     SwHTMLFormPendingStackData_Impl(
             const uno::Reference< drawing::XShape > & rShape, const Size& rTextSz,
             sal_Bool bMinW, sal_Bool bMinH ) :
@@ -2213,7 +2202,6 @@ void SwHTMLParser::EndTextArea()
     bTextArea = sal_False;
 }
 
-
 void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken )
 {
     OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" );
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 60f02a64aca5..ad047d2e45df 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -97,7 +97,6 @@ class CSS1Selector
     CSS1Selector *pNext;        // die naechste Komponente
 
 public:
-
     CSS1Selector( CSS1SelectorType eTyp, const OUString &rSel )
         : eType(eTyp), aSelector( rSel ), pNext( 0 )
     {}
@@ -129,7 +128,6 @@ struct CSS1Expression
     CSS1Expression *pNext;  // die naechste Komponente
 
 public:
-
     CSS1Expression( CSS1Token eTyp, const OUString &rVal,
                     double nVal, sal_Unicode cO = 0 )
         : cOp(cO), eType(eTyp), aValue(rVal), nValue(nVal), pNext(0)
@@ -228,7 +226,6 @@ class CSS1Parser
     CSS1Expression *ParseDeclaration( OUString& rProperty );
 
 protected:
-
     void ParseStyleSheet();
 
     // Den Inhalt eines HTML-Style-Elements parsen.
@@ -254,7 +251,6 @@ protected:
                                     const CSS1Expression *pExpr );
 
 public:
-
     CSS1Parser();
     virtual ~CSS1Parser();
 
@@ -269,8 +265,6 @@ inline sal_uInt32 CSS1Parser::SetLinePos( sal_uInt32 nlPos )
     return nlOld;
 }
 
-
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 7f798f343cf5..d3c6c736cc8d 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -93,6 +93,7 @@ private:
     sal_uInt8 SprmDataOfs(sal_uInt16 nId) const;
 
     enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2};
+
 public:
     //7- ids are very different to 8+ ones
     wwSprmParser(ww::WordVersion eVersion);
@@ -192,6 +193,7 @@ private:
     long nIMax;             ///< Anzahl der Elemente
     long nIdx;              ///< Merker, wo wir gerade sind
     sal_uInt32 nStru;
+
 public:
     WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF,
         sal_uInt32 nStruct);
@@ -236,6 +238,7 @@ private:
     long nRemLen;   // length of remaining SPRMs (including akt. SPRM)
 
     void UpdateMyMembers();
+
 public:
     explicit WW8SprmIter( const sal_uInt8* pSprms_, long nLen_,
         const wwSprmParser &rSprmParser);
@@ -246,6 +249,7 @@ public:
         { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; }
     const sal_uInt8* GetAktParams() const { return pAktParams; }
     sal_uInt16 GetAktId() const { return nAktId; }
+
 private:
     //No copying
     WW8SprmIter(const WW8SprmIter&);
@@ -271,6 +275,7 @@ private:
     void GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN);
 
     void MakeFailedPLCF();
+
 public:
     WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct,
         WW8_CP nStartPos = -1);
@@ -301,10 +306,12 @@ public:
 class WW8PLCFpcd
 {
 friend class WW8PLCFpcd_Iter;
+
     sal_Int32* pPLCF_PosArray;  // Pointer auf Pos-Array und auf ganze Struktur
     sal_uInt8*  pPLCF_Contents;  // Pointer auf Inhalts-Array-Teil des Pos-Array
     long nIMax;
     sal_uInt32 nStru;
+
 public:
     WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF,
         sal_uInt32 nStruct);
@@ -321,6 +328,7 @@ private:
     //No copying
     WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&);
     WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&);
+
 public:
     WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 );
     long GetIdx() const { return nIdx; }
@@ -356,6 +364,7 @@ private:
     //No copying
     WW8PLCFx(const WW8PLCFx&);
     WW8PLCFx& operator=(const WW8PLCFx&);
+
 public:
     WW8PLCFx(ww::WordVersion eVersion, bool bSprm)
         : meVer(eVersion), bIsSprm(bSprm), bDirty(false) {}
@@ -393,6 +402,7 @@ private:
     //No copying
     WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&);
     WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&);
+
 public:
     WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD,
         const WW8ScannerBase* pBase );
@@ -416,6 +426,7 @@ private:
     //No copying
     WW8PLCFx_PCD(const WW8PLCFx_PCD&);
     WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&);
+
 public:
     WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
         WW8_CP nStartCp, bool bVer67P);
@@ -485,6 +496,7 @@ public:
 
         //Fill in an Entry with sanity testing
         void FillEntry(Entry &rEntry, sal_Size nDataOffset, sal_uInt16 nLen);
+
     public:
         WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm,
             SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl,
@@ -520,6 +532,7 @@ public:
 
         const wwSprmParser &GetSprmParser() const { return maSprmParser; }
     };
+
 private:
     SvStream* pFKPStrm;         // Input-File
     SvStream* pDataStrm;        // Input-File
@@ -547,9 +560,11 @@ private:
     //No copying
     WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&);
     WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&);
+
 protected:
     ePLCFT ePLCF;
     WW8PLCFx_PCDAttrs* pPCDAttrs;
+
 public:
     WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
         const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL );
@@ -581,6 +596,7 @@ private:
     //No copying
     WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&);
     WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&);
+
 public:
     WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
         const WW8ScannerBase& rBase,  ePLCFT ePl );
@@ -613,6 +629,7 @@ private:
     //no copying
     WW8PLCFx_SEPX(const WW8PLCFx_SEPX&);
     WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&);
+
 public:
     WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
         WW8_CP nStartCp );
@@ -642,6 +659,7 @@ private:
     //No copying
     WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&);
     WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&);
+
 public:
     WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
     long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0);
@@ -673,6 +691,7 @@ private:
     //No copying
     WW8PLCFx_FLD(const WW8PLCFx_FLD&);
     WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &);
+
 public:
     WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
     virtual ~WW8PLCFx_FLD();
@@ -703,6 +722,7 @@ private:
     //No copying
     WW8PLCFx_Book(const WW8PLCFx_Book&);
     WW8PLCFx_Book& operator=(const WW8PLCFx_Book&);
+
 public:
     WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib);
     virtual ~WW8PLCFx_Book();
@@ -802,6 +822,7 @@ class WW8PLCFMan
 {
 public:
     enum WW8PLCFManLimits {MAN_ANZ_PLCF = 10};
+
 private:
     wwSprmParser maSprmParser;
     long nCpO;                      // Origin Cp -- the basis for nNewCp
@@ -834,6 +855,7 @@ private:
     void AdvSprm(short nIdx, bool bStart);
     void AdvNoSprm(short nIdx, bool bStart);
     sal_uInt16 GetId(const WW8PLCFxDesc* p ) const;
+
 public:
     WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
         bool bDoingDrawTextBox = false);
@@ -937,6 +959,7 @@ private:
 
     WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF );
     void DeletePieceTable();
+
 public:
     WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
         WW8Fib* pWwF );
@@ -1453,6 +1476,7 @@ protected:
     //No copying
     WW8Style(const WW8Style&);
     WW8Style& operator=(const WW8Style&);
+
 public:
     WW8Style( SvStream& rSt, WW8Fib& rFibPara );
     WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd );
@@ -1465,6 +1489,7 @@ class WW8Fonts
 protected:
     WW8_FFN* pFontA;    // Array of Pointers to Font Description
     sal_uInt16 nMax;        // Array-Size
+
 public:
     WW8Fonts( SvStream& rSt, WW8Fib& rFib );
     ~WW8Fonts() { delete[] pFontA; }
@@ -1746,6 +1771,7 @@ private:
     WW8PLCF aPLCF;
     long nTextOfs;
     short nIdxOffset;
+
 public:
     WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop );
     bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, long& rLen);
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index e321fc8a2925..c4f6d6840637 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -36,6 +36,7 @@ class MSOWordCommandConvertor : public MSOCommandConvertor
 {
    IdToString msoToOOcmd;
    IdToString tcidToOOcmd;
+
 public:
     MSOWordCommandConvertor();
     virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
@@ -72,7 +73,6 @@ OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
     return sResult;
 }
 
-
 SwCTBWrapper::SwCTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId )
 ,reserved2(0)
 ,reserved3(0)
@@ -486,7 +486,6 @@ bool SwCTB::IsMenuToolbar()
     return tb.IsMenuToolbar();
 }
 
-
 bool SwCTB::Read( SvStream &rS)
 {
     SAL_INFO("sw.ww8","SwCTB::Read() stream pos 0x" << std::hex << rS.Tell() );
@@ -758,8 +757,6 @@ SwTBC::GetCustomText()
     if ( tbcd.get() )
         sCustomText = tbcd->getGeneralInfo().CustomText();
     return sCustomText;
-
-
 }
 
 bool
@@ -887,7 +884,6 @@ bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
     return true;
 }
 
-
 bool Tcg255::Read(SvStream &rS)
 {
     SAL_INFO("sw.ww8","Tcg255::Read() stream pos 0x" << std::hex << rS.Tell() );
@@ -921,7 +917,6 @@ void Tcg255::Print( FILE* fp)
     }
 }
 
-
 Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0)
 {
 }
@@ -979,7 +974,6 @@ PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId )
 {
 }
 
-
 PlfAcd::~PlfAcd()
 {
     if ( rgacd )
@@ -1003,6 +997,7 @@ bool PlfAcd::Read( SvStream &rS)
     }
     return true;
 }
+
 void PlfAcd::Print( FILE* fp )
 {
     Indent a;
@@ -1126,6 +1121,7 @@ void TcgSttbfCore::Print( FILE* fp )
     }
 
 }
+
 MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId )
 ,iMac( 0 )
 ,rgNames( NULL )
@@ -1174,7 +1170,6 @@ MacroName::MacroName():ibst(0)
 {
 }
 
-
 bool MacroName::Read(SvStream &rS)
 {
     SAL_INFO("sw.ww8","MacroName::Read() stream pos 0x" << std::hex << rS.Tell() );
@@ -1191,8 +1186,6 @@ void MacroName::Print( FILE* fp )
     xstz.Print( fp );
 }
 
-
-
 Xstz::Xstz():chTerm(0)
 {
 }
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 3bca70f63396..943166672aef 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -14,6 +14,7 @@
 class Xst : public TBBase
 {
     OUString sString;
+
 public:
     Xst(){}
     bool Read(SvStream &rS);
@@ -27,6 +28,7 @@ class SwTBC : public TBBase
     TBCHeader tbch;
     boost::shared_ptr< sal_uInt32 > cid; // optional
     boost::shared_ptr<TBCData> tbcd;
+
 public:
     SwTBC();
     ~SwTBC();
@@ -50,6 +52,7 @@ class SwCTB : public TBBase
 
     SwCTB(const SwCTB&);
     SwCTB& operator = ( const SwCTB&);
+
 public:
     SwCTB();
     ~SwCTB();
@@ -71,6 +74,7 @@ class TBDelta : public TBBase
     sal_Int32 fc;
     sal_uInt16 CiTBDE; // careful of this ( endian matters etc. )
     sal_uInt16 cbTBC;
+
 public:
     TBDelta();
     ~TBDelta(){}
@@ -88,11 +92,14 @@ public:
 class Tcg255SubStruct : public TBBase
 {
 friend class Tcg255;
+
     bool mbReadId;
     Tcg255SubStruct(const Tcg255SubStruct&);
     Tcg255SubStruct& operator = ( const Tcg255SubStruct&);
+
 protected:
     sal_uInt8 ch;
+
 public:
     Tcg255SubStruct( bool bReadId );
     ~Tcg255SubStruct(){}
@@ -101,9 +108,11 @@ public:
 };
 
 class SwCTBWrapper;
+
 class Customization : public TBBase
 {
 friend class SwCTBWrapper;
+
     sal_Int32 tbidForTBD;
     sal_uInt16 reserved1;
     sal_Int16 ctbds;
@@ -112,6 +121,7 @@ friend class SwCTBWrapper;
     std::vector< TBDelta > customizationDataTBDelta;
     bool bIsDroppedMenuTB;
     bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+
 public:
     Customization( SwCTBWrapper* rapper );
     ~Customization();
@@ -143,6 +153,7 @@ class SwCTBWrapper : public Tcg255SubStruct
     std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
     SwCTBWrapper(const SwCTBWrapper&);
     SwCTBWrapper& operator = ( const SwCTBWrapper&);
+
 public:
     SwCTBWrapper( bool bReadId = true );
     ~SwCTBWrapper();
@@ -182,6 +193,7 @@ class PlfMcd : public Tcg255SubStruct
     std::vector<MCD> rgmcd; // array of MCD's
     PlfMcd(const PlfMcd&);
     PlfMcd& operator = ( const PlfMcd&);
+
 public:
     PlfMcd( bool bReadId = true );
     bool Read(SvStream &rS);
@@ -194,6 +206,7 @@ class Acd : public TBBase
     sal_uInt16 fciBasedOnABC; //  fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
     Acd(const Acd&);
     Acd& operator = ( const Acd&);
+
 public:
     Acd();
     ~Acd(){}
@@ -207,6 +220,7 @@ class PlfAcd: public Tcg255SubStruct
     Acd* rgacd;
     PlfAcd(const PlfAcd&);
     PlfAcd& operator = ( const PlfAcd&);
+
 public:
     PlfAcd( bool bReadId = true );
     ~PlfAcd();
@@ -225,6 +239,7 @@ class Kme : public TBBase
 
     Kme(const Kme&);
     Kme& operator = ( const Kme&);
+
 public:
     Kme();
     ~Kme();
@@ -238,6 +253,7 @@ class PlfKme : public Tcg255SubStruct
     Kme* rgkme;
     PlfKme(const PlfKme&);
     PlfKme& operator = ( const PlfKme&);
+
 public:
     PlfKme( bool bReadId = true );
     ~PlfKme();
@@ -254,12 +270,14 @@ struct SBBItem
     sal_uInt16 extraData;
     SBBItem() : cchData(0), extraData(0){}
 };
+
     sal_uInt16 fExtend;
     sal_uInt16 cData;
     sal_uInt16 cbExtra;
     SBBItem* dataItems;
     TcgSttbfCore(const TcgSttbfCore&);
     TcgSttbfCore& operator = ( const TcgSttbfCore&);
+
 public:
     TcgSttbfCore();
     ~TcgSttbfCore();
@@ -272,6 +290,7 @@ class TcgSttbf : public Tcg255SubStruct
     TcgSttbfCore sttbf;
     TcgSttbf(const TcgSttbf&);
     TcgSttbf& operator = ( const TcgSttbf&);
+
 public:
     TcgSttbf( bool bReadId = true );
     ~TcgSttbf(){}
@@ -286,6 +305,7 @@ class Xstz : public TBBase
 
     Xstz(const Xstz&);
     Xstz& operator = ( const Xstz&);
+
 public:
     Xstz();
     ~Xstz(){}
@@ -299,6 +319,7 @@ class MacroName : public TBBase
     Xstz xstz;
     MacroName(const MacroName&);
     MacroName& operator = ( const MacroName&);
+
 public:
     MacroName();
     ~MacroName(){}
@@ -313,6 +334,7 @@ class MacroNames : public Tcg255SubStruct
 
     MacroNames(const MacroNames&);
     MacroNames& operator = ( const MacroNames&);
+
 public:
     MacroNames( bool bReadId = true );
     ~MacroNames();
@@ -326,6 +348,7 @@ class Tcg255 : public TBBase
     Tcg255(const Tcg255&);
     Tcg255& operator = ( const Tcg255&);
     bool processSubStruct( sal_uInt8 nId, SvStream& );
+
 public:
     Tcg255();
     ~Tcg255();
@@ -340,6 +363,7 @@ class Tcg: public TBBase
     std::auto_ptr< Tcg255 > tcg;
     Tcg(const Tcg&);
     Tcg& operator = ( const Tcg&);
+
 public:
     Tcg();
     ~Tcg(){}
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 5b4bad2a62fc..a24bae455889 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -66,7 +66,9 @@
 #include <popup.hrc>
 #include <svx/extedit.hxx>
 #include <svx/graphichelper.hxx>
+
 #define SwGrfShell
+
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
@@ -110,6 +112,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             GetView().ExecuteScan( rReq );
             break;
         }
+
         case SID_SAVE_GRAPHIC:
         {
             const Graphic *pGraphic;
@@ -122,6 +125,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             }
         }
         break;
+
         case SID_COMPRESS_GRAPHIC:
         {
             const Graphic* pGraphic = rSh.GetGraphic();
@@ -166,6 +170,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             }
         }
         break;
+
         case SID_EXTERNAL_EDIT:
         {
             // When the graphic is selected to be opened via some external tool
@@ -178,6 +183,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             }
         }
         break;
+
         case SID_INSERT_GRAPHIC:
         case FN_FORMAT_GRAFIC_DLG:
         case FN_DRAW_WRAP_DLG:
@@ -485,26 +491,31 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
                 aGrfSet.Put( SwLuminanceGrf(
                             ((SfxInt16Item*)pItem)->GetValue() ));
             break;
+
         case SID_ATTR_GRAF_CONTRAST:
             if( pItem )
                 aGrfSet.Put( SwContrastGrf(
                             ((SfxInt16Item*)pItem)->GetValue() ));
             break;
+
         case SID_ATTR_GRAF_RED:
             if( pItem )
                 aGrfSet.Put( SwChannelRGrf(
                             ((SfxInt16Item*)pItem)->GetValue() ));
             break;
+
         case SID_ATTR_GRAF_GREEN:
             if( pItem )
                 aGrfSet.Put( SwChannelGGrf(
                             ((SfxInt16Item*)pItem)->GetValue() ));
             break;
+
         case SID_ATTR_GRAF_BLUE:
             if( pItem )
                 aGrfSet.Put( SwChannelBGrf(
                             ((SfxInt16Item*)pItem)->GetValue() ));
             break;
+
         case SID_ATTR_GRAF_GAMMA:
             if( pItem )
             {
@@ -512,11 +523,13 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
                 aGrfSet.Put( SwGammaGrf(fVal/100. ));
             }
             break;
+
         case SID_ATTR_GRAF_TRANSPARENCE:
             if( pItem )
                 aGrfSet.Put( SwTransparencyGrf(
                     static_cast< sal_Int8 >( ( (SfxUInt16Item*)pItem )->GetValue() ) ) );
             break;
+
         case SID_ATTR_GRAF_INVERT:
             if( pItem )
                 aGrfSet.Put( SwInvertGrf(
@@ -535,6 +548,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
             aToolboxAccess.toggleToolbox();
             break;
         }
+
         case SID_GRFFILTER:
         case SID_GRFFILTER_INVERT:
         case SID_GRFFILTER_SMOOTH:
@@ -565,6 +579,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
         default:
             OSL_ENSURE(!this, "wrong dispatcher");
         }
+
         if( aGrfSet.Count() )
             GetShell().SetAttr( aGrfSet );
     }
@@ -594,11 +609,13 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
             if( bParentCntProt || !bIsGrfCntnt )
                 bDisable = true;
             break;
+
         case SID_SAVE_GRAPHIC:
         case SID_EXTERNAL_EDIT:
             if( rSh.GetGraphicType() == GRAPHIC_NONE )
                 bDisable = true;
             break;
+
         case SID_COLOR_SETTINGS:
         {
             if ( bParentCntProt || !bIsGrfCntnt )
@@ -633,27 +650,30 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
             }
             break;
 
-
         case SID_ATTR_GRAF_LUMINANCE:
             if( !bParentCntProt )
                 rSet.Put( SfxInt16Item( nWhich, ((SwLuminanceGrf&)
                         aCoreSet.Get(RES_GRFATR_LUMINANCE)).GetValue() ));
             break;
+
         case SID_ATTR_GRAF_CONTRAST:
             if( !bParentCntProt )
                 rSet.Put( SfxInt16Item( nWhich, ((SwContrastGrf&)
                         aCoreSet.Get(RES_GRFATR_CONTRAST)).GetValue() ));
             break;
+
         case SID_ATTR_GRAF_RED:
             if( !bParentCntProt )
                 rSet.Put( SfxInt16Item( nWhich, ((SwChannelRGrf&)
                         aCoreSet.Get(RES_GRFATR_CHANNELR)).GetValue() ));
             break;
+
         case SID_ATTR_GRAF_GREEN:
             if( !bParentCntProt )
                 rSet.Put( SfxInt16Item( nWhich, ((SwChannelGGrf&)
                         aCoreSet.Get(RES_GRFATR_CHANNELG)).GetValue() ));
             break;
+
         case SID_ATTR_GRAF_BLUE:
             if( !bParentCntProt )
                 rSet.Put( SfxInt16Item( nWhich, ((SwChannelBGrf&)
@@ -665,6 +685,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
                 rSet.Put( SfxUInt32Item( nWhich, static_cast< sal_uInt32 >(
                     ( (SwGammaGrf&)aCoreSet.Get( RES_GRFATR_GAMMA ) ).GetValue() * 100 ) ) );
             break;
+
         case SID_ATTR_GRAF_TRANSPARENCE:
             if( !bParentCntProt )
             {
@@ -681,6 +702,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
                 }
             }
             break;
+
         case SID_ATTR_GRAF_INVERT:
             if( !bParentCntProt )
                 rSet.Put( SfxBoolItem( nWhich, ((SwInvertGrf&)
@@ -838,10 +860,8 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
     SetGetStateSet( 0 );
 }
 
-
 SwGrfShell::SwGrfShell(SwView &_rView) :
     SwBaseShell(_rView)
-
 {
     SetName(OUString("Graphic"));
     SetHelpId(SW_GRFSHELL);
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index ab0d7180c034..817c660d7be0 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <wrtsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index c0fc69dab3f3..2be6825398f7 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <hintids.hxx>
 #include "uitool.hxx"
 #include <sfx2/app.hxx>
@@ -59,10 +58,7 @@
 
 using namespace ::com::sun::star;
 
-// Debug Method
-
 // Pack columns
-
 static void lcl_FillSvxColumn(const SwFmtCol& rCol,
                           sal_uInt16 nTotalWidth,
                           SvxColumnItem& rColItem,
@@ -102,7 +98,6 @@ static void lcl_FillSvxColumn(const SwFmtCol& rCol,
 }
 
 // Transfer ColumnItem in ColumnInfo
-
 static void lcl_ConvertToCols(const SvxColumnItem& rColItem,
                           sal_uInt16 nTotalWidth,
                           SwFmtCol& rCols)
@@ -151,7 +146,6 @@ static void lcl_ConvertToCols(const SvxColumnItem& rColItem,
 }
 
 // Delete tabs
-
 static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 {
     // Delete DefTabs
@@ -169,7 +163,6 @@ static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 }
 
 // Flip page margin
-
 void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
 {
     sal_uInt16 nPhyPage, nVirPage;
@@ -185,7 +178,6 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
 
 // If the frame border is moved, the column separator
 // should stay in the same absolute position.
-
 static void lcl_Scale(long& nVal, long nScale)
 {
     nVal *= nScale;
@@ -233,7 +225,6 @@ void ResizeFrameCols(SwFmtCol& rCol,
 }
 
 // Here all changes to the tab bar will be shot again into the model.
-
 void SwView::ExecTabWin( SfxRequest& rReq )
 {
     SwWrtShell &rSh         = GetWrtShell();
@@ -973,7 +964,6 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 // Here the status of the tab bar will be determined.
 // This means that all relevant attributes at the CursorPos
 // will be submittet to the tab bar.
-
 void SwView::StateTabWin(SfxItemSet& rSet)
 {
     SwWrtShell &rSh         = GetWrtShell();