remove ascii art and blank lines in tools/inc/

Also added some lines for better readability.

This is a follow-up patch of c8b7aa55138848fe07108779099267424bc03e3d.

Change-Id: I50e6c05141ef3b8db70302d8853b46c38414c6d5

41 files changed, 25 insertions, 161 deletions

diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index f4525e6bef01..17b98144a8c5 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _PRJ_HXX
 #define _PRJ_HXX
 
@@ -31,6 +30,7 @@ class SimpleConfig
     rtl::OString aStringBuffer;
 
     rtl::OString GetNextLine();
+
 public:
     SimpleConfig(const String& rSimpleConfigFileName);
     ~SimpleConfig();
diff --git a/tools/inc/impcont.hxx b/tools/inc/impcont.hxx
index b6a7f5d96d23..1cfb374e61c4 100644
--- a/tools/inc/impcont.hxx
+++ b/tools/inc/impcont.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _IMPCONT_HXX
 #define _IMPCONT_HXX
 
diff --git a/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx
index dfa583bb890b..1db5ea730048 100644
--- a/tools/inc/impstrg.hxx
+++ b/tools/inc/impstrg.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _IMPSTRG_HXX
 #define _IMPSTRG_HXX
 
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index b0acd662621d..e71ba555ce3a 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _POLY_H
 #define _POLY_H
 
diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx
index 94b0421efc8a..6461fdb020f4 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/tools/inc/tools/appendunixshellword.hxx
@@ -23,7 +23,6 @@
 #include "sal/config.h"
 
 #if defined UNX
-
 #include "tools/toolsdllapi.h"
 
 namespace rtl {
@@ -45,7 +44,6 @@ TOOLS_DLLPUBLIC void appendUnixShellWord(
     rtl::OStringBuffer * accumulator, rtl::OString const & text);
 
 }
-
 #endif
 
 #endif
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 707593542fa4..2024c889f4b6 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -252,7 +252,6 @@ protected:
     virtual void DeviceRectangleChange();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 276efacb3f99..40242aee7ab5 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -25,6 +25,7 @@
 #include <tools/solar.h>
 
 class SvStream;
+
 #ifdef _TLBIGINT_INT64
 struct SbxINT64;
 struct SbxUINT64;
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index e53ef44e9e62..55637a58ea0e 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -23,8 +23,8 @@
 
 class SvStream;
 class ResId;
-#include <tools/solar.h>
 
+#include <tools/solar.h>
 #include <basegfx/color/bcolor.hxx>
 
 // Color types
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index 28184554c858..c28fd0af71e8 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -33,7 +33,6 @@ private:
     sal_uInt32      nDate;
 
 public:
-
     enum DateInitSystem
     {
         SYSTEM
diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 0f1ab52bdda7..19c4d1ac7cf3 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.hxx
@@ -27,7 +27,6 @@
 class TOOLS_DLLPUBLIC DateTime : public Date, public Time
 {
 public:
-
     enum DateTimeInitSystem
     {
         SYSTEM
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 309a4518fef2..c9f2ffc5217c 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _TOOLS_DEBUG_HXX
 #define _TOOLS_DEBUG_HXX
 
@@ -164,6 +163,7 @@ inline void DbgSetAbort( DbgPrintLine pProc )
 }
 
 typedef sal_uInt16 DbgChannelId;
+
 /** registers a user-defined channel for emitting the diagnostic messages
 
     Note that such a user-defined channel cannot be revoked during the lifetime
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index d106c874527d..11afdd26353a 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef TOOLS_DIAGNOSE_EX_H
 #define TOOLS_DIAGNOSE_EX_H
 
@@ -28,12 +27,10 @@
 
 #include <boost/current_function.hpp>
 
-
 #define OSL_UNUSED( expression ) \
     (void)(expression)
 
 #if OSL_DEBUG_LEVEL > 0
-
     #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
     #include <com/sun/star/task/ErrorCodeIOException.hpp>
     #include <cppuhelper/exc_hlp.hxx>
@@ -89,12 +86,9 @@
         OSL_ENSURE( false, sMessage.getStr() )
 
 #else   // OSL_DEBUG_LEVEL
-
     #define DBG_UNHANDLED_EXCEPTION()
-
 #endif  // OSL_DEBUG_LEVEL
 
-
 /** This macro asserts the given condition (in debug mode), and throws
     an IllegalArgumentException afterwards.
  */
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index fdd6ffca98f2..884e9f09748e 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.hxx
@@ -248,7 +248,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
                                          ERRCODE_AREA_IO)
 
 // FsysErrorCodes
-
 #define FSYS_ERR_OK                     ERRCODE_NONE
 #define FSYS_ERR_MISPLACEDCHAR          ERRCODE_IO_MISPLACEDCHAR
 #define FSYS_ERR_INVALIDCHAR            ERRCODE_IO_INVALIDCHAR
@@ -265,7 +264,6 @@ inline sal_uIntPtr ERRCODE_TOERROR( sal_uIntPtr x )
 #define FSYS_ERR_UNKNOWN                ERRCODE_IO_UNKNOWN
 
 // StreamErrorCodes
-
 #define SVSTREAM_OK                     ERRCODE_NONE
 
 #define SVSTREAM_GENERALERROR           ERRCODE_IO_GENERAL
diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/tools/inc/tools/extendapplicationenvironment.hxx
index 49f32e0b6650..b6ccbf8d5491 100644
--- a/tools/inc/tools/extendapplicationenvironment.hxx
+++ b/tools/inc/tools/extendapplicationenvironment.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef INCLUDED_TOOLS_EXTENDAPPLICATIONENVIRONMENT_HXX
 #define INCLUDED_TOOLS_EXTENDAPPLICATIONENVIRONMENT_HXX
 
diff --git a/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx
index a87b0cc60054..2b4a9158dfec 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/tools/inc/tools/fldunit.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _TOOLS_FLDUNIT_HXX
 #define _TOOLS_FLDUNIT_HXX
 
diff --git a/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx
index e9792f0ddc21..7a53e931cc1c 100644
--- a/tools/inc/tools/fontenum.hxx
+++ b/tools/inc/tools/fontenum.hxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _TOOLS_FONTENUM_HXX
 #define _TOOLS_FONTENUM_HXX
 
@@ -25,69 +24,44 @@
 
 #ifndef ENUM_FONTFAMILY_DECLARED
 #define ENUM_FONTFAMILY_DECLARED
-
 enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN,
                   FAMILY_ROMAN, FAMILY_SCRIPT, FAMILY_SWISS, FAMILY_SYSTEM, FontFamily_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTPITCH_DECLARED
 #define ENUM_FONTPITCH_DECLARED
-
 enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_TEXTALIGN_DECLARED
 #define ENUM_TEXTALIGN_DECLARED
-
 enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTWEIGHT_DECLARED
 #define ENUM_FONTWEIGHT_DECLARED
-
 enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT,
                   WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL,
                   WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD,
                   WEIGHT_ULTRABOLD, WEIGHT_BLACK, FontWeight_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTWIDTH_DECLARED
 #define ENUM_FONTWIDTH_DECLARED
-
 enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
                  WIDTH_CONDENSED, WIDTH_SEMI_CONDENSED, WIDTH_NORMAL,
                  WIDTH_SEMI_EXPANDED, WIDTH_EXPANDED, WIDTH_EXTRA_EXPANDED,
                  WIDTH_ULTRA_EXPANDED,
                  FontWidth_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTITALIC_DECLARED
 #define ENUM_FONTITALIC_DECLARED
-
 enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTUNDERLINE_DECLARED
 #define ENUM_FONTUNDERLINE_DECLARED
-
 enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
                      UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
                      UNDERLINE_DASH, UNDERLINE_LONGDASH,
@@ -99,23 +73,16 @@ enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
                      UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
                      UNDERLINE_BOLDWAVE,
                      FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTSTRIKEOUT_DECLARED
 #define ENUM_FONTSTRIKEOUT_DECLARED
-
 enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
                      STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
                      STRIKEOUT_SLASH, STRIKEOUT_X,
                      FontStrikeout_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTEMPHASISMARK_DECLARED
 #define ENUM_FONTEMPHASISMARK_DECLARED
 
@@ -137,28 +104,20 @@ typedef sal_uInt16 FontEmphasisMark;
 
 #endif
 
-// ------------------------------------------------------------
-
 #ifndef ENUM_FONTTYPE_DECLARED
 #define ENUM_FONTTYPE_DECLARED
-
 enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE,
                 FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
 #endif
 
 #ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
 #define ENUM_FONTEMBEDDEDBITMAP_DECLARED
-
 enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
-
 #endif
 
 #ifndef ENUM_FONTANTIALIAS_DECLARED
 #define ENUM_FONTANTIALIAS_DECLARED
-
 enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
-
 #endif
 
 #endif
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index abaf18ea4947..6a91cdadae4c 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -133,6 +133,7 @@ enum FSysExact
 
 // FileStat
 struct dirent;
+
 class TOOLS_DLLPUBLIC FileStat
 {
     friend class    Dir;
@@ -150,6 +151,7 @@ class TOOLS_DLLPUBLIC FileStat
     Time            aTimeModified;
     Date            aDateAccessed;
     Time            aTimeAccessed;
+
 private:
     TOOLS_DLLPRIVATE void           ImpInit( void* );
 
@@ -230,6 +232,7 @@ protected:
 protected:
     void                SetError( sal_uIntPtr nErr ) { nError = nErr; }
     DirEntry*           GetParent() { return pParent; }
+
 public:
                         DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT );
                         DirEntry( const DirEntry& rEntry );
diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx
index 891e63bf92dc..16eedfe1b8cd 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/tools/inc/tools/getprocessworkingdir.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX
 
 #include "sal/config.h"
-
 #include "tools/toolsdllapi.h"
 
 namespace rtl { class OUString; }
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index 76260c1093b8..2ea6850801d1 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/string.hxx>
 
-/*************************************************************************
-*************************************************************************/
 struct ImpSvGlobalName
 {
     sal_uInt8       szData[ 16 ];
@@ -50,12 +48,15 @@ typedef struct _GUID GUID;
 #else
 struct GUID;
 #endif
+
 typedef GUID CLSID;
 class SvStream;
+
 class TOOLS_DLLPUBLIC SvGlobalName
 {
     ImpSvGlobalName * pImp;
     void    NewImp();
+
 public:
             SvGlobalName();
             SvGlobalName( const SvGlobalName & rObj )
diff --git a/tools/inc/tools/helpers.hxx b/tools/inc/tools/helpers.hxx
index f34a7c20893c..5a525872ae50 100644
--- a/tools/inc/tools/helpers.hxx
+++ b/tools/inc/tools/helpers.hxx
@@ -6,8 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
-
 #ifndef _TOOLS_HELPERS_HXX
 #define _TOOLS_HELPERS_HXX
 
@@ -16,13 +14,11 @@ inline long MinMax( long nVal, long nMin, long nMax )
     return nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin;
 }
 
-
 inline long AlignedWidth4Bytes( long nWidthBits )
 {
     return ( ( nWidthBits + 31 ) >> 5 ) << 2;
 }
 
-
 inline long FRound( double fVal )
 {
     return fVal > 0.0 ? static_cast<long>( fVal + 0.5 ) : -static_cast<long>( -fVal + 0.5 );
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 31da16de60f4..5131f995900c 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -35,7 +35,6 @@ class INetContentTypeParameterList;
 class INetMIMECharsetList_Impl;
 class INetMIMEOutputSink;
 
-//============================================================================
 class TOOLS_DLLPUBLIC INetMIME
 {
 public:
@@ -824,7 +823,6 @@ inline sal_Unicode * INetMIME::putUTF32Character(sal_Unicode * pBuffer,
     return pBuffer;
 }
 
-//============================================================================
 class INetMIMEOutputSink
 {
 public:
@@ -1063,7 +1061,6 @@ inline void INetMIME::writeEscapeSequence(INetMIMEOutputSink & rSink,
           << sal_uInt8(getHexDigit(nChar & 15));
 }
 
-//============================================================================
 class INetMIMEStringOutputSink: public INetMIMEOutputSink
 {
     rtl::OStringBuffer m_aBuffer;
@@ -1087,7 +1084,6 @@ public:
     }
 };
 
-//============================================================================
 class INetMIMEEncodedWordOutputSink
 {
 public:
@@ -1191,7 +1187,6 @@ inline bool INetMIMEEncodedWordOutputSink::flush()
     return m_ePrevCoding != CODING_NONE;
 }
 
-//============================================================================
 struct INetContentTypeParameter
 {
     /** The name of the attribute, in US-ASCII encoding and converted to lower
@@ -1248,7 +1243,6 @@ struct INetContentTypeParameter
     }
 };
 
-//============================================================================
 class TOOLS_DLLPUBLIC INetContentTypeParameterList
 {
 public:
@@ -1277,7 +1271,6 @@ private:
     boost::ptr_vector<INetContentTypeParameter> maEntries;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 0d329ecdb17a..b27b56c4fe36 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -21,12 +21,11 @@
 
 #include "tools/toolsdllapi.h"
 #include <sal/types.h>
-
 #include <rtl/textenc.h>
-
 #include <tools/inetmime.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
+
 #include <vector>
 
 class DateTime;
@@ -81,6 +80,7 @@ public:
 };
 
  typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
+
 class INetMessage
 {
     HeaderList_impl m_aHeaderList;
@@ -221,10 +221,8 @@ public:
 #define INETMSG_RFC822_SENDER             11
 #define INETMSG_RFC822_SUBJECT            12
 #define INETMSG_RFC822_TO                 13
-
 #define INETMSG_RFC822_X_MAILER           14
 #define INETMSG_RFC822_RETURN_RECEIPT_TO  15
-
 #define INETMSG_RFC822_NUMHDR             16
 
 class TOOLS_DLLPUBLIC INetRFC822Message : public INetMessage
@@ -379,7 +377,6 @@ public:
 #define INETMSG_MIME_CONTENT_ID                 3
 #define INETMSG_MIME_CONTENT_TYPE               4
 #define INETMSG_MIME_CONTENT_TRANSFER_ENCODING  5
-
 #define INETMSG_MIME_NUMHDR                     6
 
 enum INetMessageContainerType
@@ -395,10 +392,10 @@ enum INetMessageContainerType
 
 class INetMIMEMessage;
 typedef ::std::vector< INetMIMEMessage* > INetMIMEMessgeList_impl;
+
 class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message
 {
     sal_uIntPtr             m_nIndex[INETMSG_MIME_NUMHDR];
-
     INetMIMEMessage*        pParent;
     INetMIMEMessgeList_impl aChildren;
     rtl::OString            m_aBoundary;
diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index ca4f7808da2e..cc6bf222a278 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.hxx
@@ -27,7 +27,6 @@ class Link;
 class TOOLS_DLLPUBLIC Line
 {
 private:
-
     Point           maStart;
     Point           maEnd;
 
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 6fcebb455663..20eb547be5dd 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -26,14 +26,10 @@
 #include <vector>
 #include <set>
 
-//------------------------------------------------------------------
-
 typedef ::std::vector< Range* > ImpSelList;
 
 #define SFX_ENDOFSELECTION      ULONG_MAX
 
-//------------------------------------------------------------------
-
 class TOOLS_DLLPUBLIC MultiSelection
 {
 private:
@@ -127,6 +123,7 @@ public:
                   sal_Int32 i_nCurrent )
         : pEnumerator( i_pEnum ), pPossibleValues( i_pPossibleValues )
         , nRangeIndex( i_nRange ), nCurrent( i_nCurrent ) {}
+
     public:
         Iterator() : pEnumerator( NULL ), pPossibleValues( NULL ), nRangeIndex( -1 ), nCurrent( -1 ) {}
         Iterator& operator++();
@@ -151,7 +148,6 @@ public:
     bool isValidInput() const { return mbValidInput; }
     bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
 
-
     /**
     i_rPageRange:     the string to be changed into a sequence of numbers
                       valid format example "5-3,9,9,7-8" ; instead of ',' ';' or ' ' are allowed as well
diff --git a/tools/inc/tools/pathutils.hxx b/tools/inc/tools/pathutils.hxx
index d7e4e89f576e..2153db7c7c3f 100644
--- a/tools/inc/tools/pathutils.hxx
+++ b/tools/inc/tools/pathutils.hxx
@@ -16,23 +16,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef INCLUDED_TOOLS_PATHUTILS_HXX
 #define INCLUDED_TOOLS_PATHUTILS_HXX
 
 #include "sal/config.h"
 
 #if defined WNT
-
 #include <cstddef>
-
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 // The compiled code is not part of the tl dynamic library, but is delivered as
 // pathutils-obj and pathutils-slo objects (it is linked into special
 // executables and dynamic libraries that do not link against OOo libraries):
-
 namespace tools {
 
 /** Determine the filename part of a path.
@@ -86,7 +82,6 @@ WCHAR * resolveLink(WCHAR * path);
 }
 
 #endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index c5a7f913ff4b..a51fd87be2af 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -28,8 +28,6 @@
 #define POLY_APPEND             (0xFFFF)
 #define POLYPOLY_APPEND         (0xFFFF)
 
-// ------------------------------------------------------------------------
-
 #define POLY_OPTIMIZE_NONE      0x00000000UL
 #define POLY_OPTIMIZE_OPEN      0x00000001UL
 #define POLY_OPTIMIZE_CLOSE     0x00000002UL
@@ -64,7 +62,6 @@ private:
     union           { sal_uIntPtr mnAbsolut; sal_uInt16 mnPercent; };
 
 public:
-
                     PolyOptimizeData() : eType( DATA_NONE ) {}
                     PolyOptimizeData( sal_uIntPtr nAbsolut ) : eType( DATA_ABSOLUT ), mnAbsolut( nAbsolut ) {}
                     PolyOptimizeData( sal_uInt16 nPercent ) : eType( DATA_PERCENT ), mnPercent( nPercent ) {}
@@ -87,13 +84,11 @@ namespace basegfx
 class TOOLS_DLLPUBLIC Polygon
 {
 private:
-
     ImplPolygon*        mpImplPolygon;
 
     TOOLS_DLLPRIVATE inline void ImplMakeUnique();
 
 public:
-
     static void         ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent );
     void                ImplRead( SvStream& rIStream );
     void                ImplWrite( SvStream& rOStream ) const;
@@ -202,7 +197,6 @@ public:
 class TOOLS_DLLPUBLIC PolyPolygon
 {
 private:
-
     ImplPolyPolygon*    mpImplPolyPolygon;
 
     TOOLS_DLLPRIVATE void  ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const;
@@ -210,7 +204,6 @@ private:
     TOOLS_DLLPRIVATE void  ImplSetFromArtVpath( void *pVpath );
 
 public:
-
                         PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
                         PolyPolygon( const Polygon& rPoly );
                         PolyPolygon( sal_uInt16 nPoly, const sal_uInt16* pPointCountAry,
diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h
index 23115c0b813f..5bcd4cb7f3b7 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.h
@@ -27,6 +27,7 @@
 #define RSC_EXTRAMAPUNIT                0xFFFF // do not change that value!
 
 typedef short RSWND_STYLE;
+
 #define RSWND_DISABLED                  0x01
 #define RSWND_CLIENTSIZE                0x02
 
diff --git a/tools/inc/tools/rcid.h b/tools/inc/tools/rcid.h
index 4cc427e73abc..d257639a99f8 100644
--- a/tools/inc/tools/rcid.h
+++ b/tools/inc/tools/rcid.h
@@ -120,7 +120,6 @@
 #define RT_SYS_STRING           (RSC_NOTYPE + 0xf3) // special case
 #define RT_SYS_FILE             (RSC_NOTYPE + 0xf4) // not implemented
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 58f488173b9a..78d665656fcc 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -55,6 +55,7 @@ class ResId
         m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr; m_nRT2 = RSC_NOTYPE; m_nWinBits = 0;
         OSL_ENSURE( m_pResMgr != NULL, "ResId without ResMgr created" );
     }
+
     public:
     ResId( RSHEADER_TYPE * pRc, ResMgr& rMgr )
     {
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index f6008f921583..7e2e5a98e68e 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -59,6 +59,7 @@ typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr );
 
 class Resource;
 class ResMgr;
+
 struct ImpRCStack
 {
     // pResource and pClassRes equal NULL: resource was not loaded
@@ -121,6 +122,7 @@ private:
     // no copying
     ResMgr(const ResMgr&);
     ResMgr& operator=(const ResMgr&);
+
 public:
     static void         DestroyAllResMgr();  ///< Called upon app shutdown
 
@@ -198,14 +200,17 @@ inline sal_uInt32 RSHEADER_TYPE::GetId()
 {
     return (sal_uInt32)ResMgr::GetLong( &nId );
 }
+
 inline RESOURCE_TYPE RSHEADER_TYPE::GetRT()
 {
     return (RESOURCE_TYPE)ResMgr::GetLong( &nRT );
 }
+
 inline sal_uInt32 RSHEADER_TYPE::GetGlobOff()
 {
     return (sal_uInt32)ResMgr::GetLong( &nGlobOff );
 }
+
 inline sal_uInt32 RSHEADER_TYPE::GetLocalOff()
 {
     return (sal_uInt32)ResMgr::GetLong( &nLocalOff );
diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index 33cc3b91fcb8..a3501b75459b 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.hxx
@@ -25,8 +25,6 @@
 
 typedef void* (*TypeId)();
 
-//-------------------------------------------------------------------------
-
 #define TYPEINFO() \
         static  void*  CreateType(); \
         static  TypeId StaticType(); \
@@ -52,8 +50,6 @@ typedef void* (*TypeId)();
 
 #define STATICTYPE(sType) (sType::StaticType())
 
-//-------------------------------------------------------------------------
-
 #define SUPERTYPE(sSuper) \
             if ( sSuper::IsOf(aSameOrSuperType ) ) \
                 return sal_True
@@ -103,8 +99,6 @@ typedef void* (*TypeId)();
 #define ISOF(sType) IsOf(sType::StaticType())
 #define CREATE(TypeId) (TypeId())
 
-//-------------------------------------------------------------------------
-
 /** Exemplary application macros for pointers
     (can be extended for use with references)
 
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index fe87f3100ffb..9c054ec7dc10 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -31,6 +31,7 @@
 #include "tools/toolsdllapi.h"
 
 class InternalResMgr;
+
 class TOOLS_DLLPUBLIC SimpleResMgr
 {
 protected:
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 35811403063f..958bd2a45041 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -92,6 +92,7 @@ typedef sal_uInt16 StreamMode;
 #define ID_PERSISTSTREAM                6
 
 class SvStream;
+
 typedef SvStream& (*SvStrPtr)( SvStream& );
 
 inline SvStream& operator<<( SvStream& rStr, SvStrPtr f );
@@ -131,12 +132,10 @@ public:
     virtual const SvStream * GetStream() const { return m_pStream; }
 
     virtual void SetSynchronMode(sal_Bool bTheSync = sal_True) { m_bSync = bTheSync; }
-
     virtual sal_Bool IsSynchronMode() const { return m_bSync; }
 
     virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount,
                            sal_Size * pRead) const;
-
     virtual ErrCode WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCount,
                             sal_Size * pWritten);
 
@@ -145,7 +144,6 @@ public:
     virtual ErrCode SetSize(sal_Size nSize);
 
     virtual ErrCode LockRegion(sal_Size, sal_Size, LockType);
-
     virtual ErrCode UnlockRegion(sal_Size, sal_Size, LockType);
 
     virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const;
@@ -161,7 +159,6 @@ public:
     TYPEINFO();
 
     SvOpenLockBytes(): SvLockBytes(0, sal_False) {}
-
     SvOpenLockBytes(SvStream * pStream, sal_Bool bOwner):
         SvLockBytes(pStream, bOwner) {}
 
@@ -192,7 +189,6 @@ public:
 
     virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount,
                            sal_Size * pRead) const;
-
     virtual ErrCode WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCount,
                             sal_Size * pWritten);
 
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index a29d8c80b6ad..8ebd70fbbf4b 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -42,20 +42,14 @@
  * There will not be any fixes to the code here.
  ******************************************************************************/
 
-// -----------------------------------------------------------------------
-
 class ResId;
 class String;
 class UniString;
 
-// -----------------------------------------------------------------------
-
 #define BYTESTRING_TO_UNISTRING_CVTFLAGS    (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\
                                              RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |\
                                              RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT)
 
-// -----------------------------------------------------------------------
-
 // CharSet
 
 #ifndef ENUM_CHARSET_DECLARED
@@ -65,8 +59,6 @@ typedef rtl_TextEncoding CharSet;
 
 #endif
 
-// -----------------------------------------------------------------------
-
 // String-Types
 
 #ifdef STRING32
@@ -83,8 +75,6 @@ typedef rtl_TextEncoding CharSet;
 
 enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 };
 
-// -----------------------------------------------------------------------
-
 //Internal String data
 
 // Data used for the management of this String
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index 1c59d4f00994..0aebbfecdd47 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.hxx
@@ -26,6 +26,7 @@
 class TOOLS_DLLPUBLIC SvBorder
 {
     long nTop, nRight, nBottom, nLeft;
+
 public:
     SvBorder()
     { nTop = nRight = nBottom = nLeft = 0; }
@@ -82,8 +83,6 @@ public:
 TOOLS_DLLPUBLIC Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder );
 TOOLS_DLLPUBLIC Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder );
 
-//=========================================================================
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 6710805333cd..82b94ee7e963 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.hxx
@@ -36,11 +36,11 @@ private:
     sal_Int32           nTime;
 
 public:
-
     enum TimeInitSystem
     {
         SYSTEM
     };
+
     // temporary until all uses are inspected and resolved
     enum TimeInitEmpty
     {
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 50d1629aaae8..900291deefb5 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -30,13 +30,11 @@ namespace com { namespace sun { namespace star { namespace util {
     class XStringWidth;
 } } } }
 
-//============================================================================
 // Special tokens:
 #define INET_PATH_TOKEN '/'
 #define INET_MARK_TOKEN '#'
 #define INET_HEX_ESCAPE '%'
 
-//============================================================================
 // Common URL prefixes for various schemes:
 #define INET_FTP_SCHEME "ftp://"
 #define INET_HTTP_SCHEME "http://"
@@ -66,7 +64,6 @@ enum
     URL_PREFIX_PRIV_EXTERN_LEN = RTL_CONSTASCII_LENGTH(URL_PREFIX_PRIV_EXTERN)
 };
 
-//============================================================================
 // Schemes:
 enum INetProtocol
 {
@@ -109,11 +106,9 @@ enum INetProtocol
     INET_PROT_END = 35
 };
 
-//============================================================================
 class TOOLS_DLLPUBLIC INetURLObject
 {
 public:
-    //========================================================================
     // Get- and Set-Methods:
 
     /** The way input strings that represent (parts of) URIs are interpreted
@@ -190,7 +185,6 @@ public:
         DECODE_UNAMBIGUOUS
     };
 
-    //========================================================================
     // General Structure:
 
     inline INetURLObject():
@@ -230,7 +224,6 @@ public:
     inline bool operator >(INetURLObject const & rObject) const
     { return rObject < *this; }
 
-    //========================================================================
     // Strict Parsing:
 
     inline INetURLObject(const rtl::OString& rTheAbsURIRef,
@@ -256,7 +249,6 @@ public:
                     EncodeMechanism eMechanism = WAS_ENCODED,
                     rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
 
-    //========================================================================
     // Smart Parsing:
 
     /** The supported notations for file system paths.
@@ -395,7 +387,6 @@ public:
                  bool bRelativeNonURIs = false,
                  FSysStyle eStyle = FSYS_DETECT) const;
 
-    //========================================================================
     // Relative URLs:
 
     inline bool
@@ -446,7 +437,6 @@ public:
               rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
               FSysStyle eStyle = FSYS_DETECT);
 
-    //========================================================================
     // External URLs:
 
     rtl::OUString getExternalURL(DecodeMechanism eMechanism = DECODE_TO_IURI,
@@ -481,7 +471,6 @@ public:
                                            rtl_TextEncoding eCharset
                                                = RTL_TEXTENCODING_UTF8);
 
-    //========================================================================
     // Scheme:
 
     struct SchemeInfo;
@@ -503,7 +492,6 @@ public:
     static INetProtocol CompareProtocolScheme(rtl::OUString const &
                                                   rTheAbsURIRef);
 
-    //========================================================================
     // User Info:
 
     inline bool HasUserData() const { return m_aUser.isPresent(); }
@@ -551,7 +539,6 @@ public:
                                rtl_TextEncoding eCharset
                                    = RTL_TEXTENCODING_UTF8);
 
-    //========================================================================
     // Host and Port:
 
     inline bool HasPort() const { return m_aPort.isPresent(); }
@@ -578,7 +565,6 @@ public:
 
     bool SetPort(sal_uInt32 nThePort);
 
-    //========================================================================
     // Path:
 
     inline bool HasURLPath() const { return !m_aPath.isEmpty(); }
@@ -598,7 +584,6 @@ public:
                            rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
     { return setPath(rThePath, false, eMechanism, eCharset); }
 
-    //========================================================================
     // Hierarchical Path:
 
     /** A constant to address the last segment in various methods dealing with
@@ -885,7 +870,6 @@ public:
      */
     bool removeFinalSlash();
 
-    //========================================================================
     // Query:
 
     inline bool HasParam() const { return m_aQuery.isPresent(); }
@@ -903,7 +887,6 @@ public:
                          EncodeMechanism eMechanism = WAS_ENCODED,
                          rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
 
-    //========================================================================
     // Fragment:
 
     inline bool HasMark() const { return m_aFragment.isPresent(); }
@@ -921,7 +904,6 @@ public:
                         EncodeMechanism eMechanism = WAS_ENCODED,
                         rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
 
-    //========================================================================
     // File URLs:
 
     /** Create an INetURLObject from a file system path.
@@ -964,14 +946,12 @@ public:
     rtl::OUString getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter = 0)
         const;
 
-    //========================================================================
     // POP3 and URLs:
 
     rtl::OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
                        rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
         const;
 
-    //========================================================================
     // Coding:
 
     enum Part
@@ -1108,14 +1088,12 @@ public:
                                rtl_TextEncoding eCharset,
                                EscapeType & rEscapeType);
 
-    //========================================================================
     // Specialized helpers:
 
     static sal_uInt32 scanDomain(sal_Unicode const *& rBegin,
                                  sal_Unicode const * pEnd,
                                  bool bEager = true);
 
-    //========================================================================
     // OBSOLETE Hierarchical Path:
 
     rtl::OUString GetPartBeforeLastName(DecodeMechanism eMechanism
@@ -1164,7 +1142,6 @@ public:
 
     bool CutLastName();
 
-    //========================================================================
     // OBSOLETE File URLs:
 
     rtl::OUString PathToFileName() const;
@@ -1201,7 +1178,6 @@ public:
 
     bool IsCaseSensitive() const;
 
-    //========================================================================
 
 private:
     // General Structure:
diff --git a/tools/inc/tools/vector2d.hxx b/tools/inc/tools/vector2d.hxx
index 82cb9313c6ca..23002f14f491 100644
--- a/tools/inc/tools/vector2d.hxx
+++ b/tools/inc/tools/vector2d.hxx
@@ -92,8 +92,6 @@ public:
     inline sal_Bool         IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); }
 };
 
-// -----------------------------------------------------------------------------
-
 inline Vector2D& Vector2D::Normalize()
 {
     double fLen = Scalar( *this );
diff --git a/tools/inc/tools/weakbase.h b/tools/inc/tools/weakbase.h
index 446695378c81..a4ce1d0962e8 100644
--- a/tools/inc/tools/weakbase.h
+++ b/tools/inc/tools/weakbase.h
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #ifndef _TOOLS_WEAKBASE_H_
 #define _TOOLS_WEAKBASE_H_
 
@@ -55,8 +54,6 @@
 namespace tools
 {
 
-// --------------------------------------------------------------------
-
 /** private connection helper, do not use directly */
 template <class reference_type>
 struct WeakConnection
@@ -69,8 +66,6 @@ struct WeakConnection
     void release() { mnRefCount--; if( mnRefCount == 0 ) delete this; }
 };
 
-// --------------------------------------------------------------------
-
 /** template implementation to hold a weak reference to an instance of type reference_type */
 template <class reference_type>
 class WeakReference
@@ -121,8 +116,6 @@ private:
     WeakConnection< reference_type >* mpWeakConnection;
 };
 
-// --------------------------------------------------------------------
-
 /** derive your implementation classes from this class if you want them to support weak references */
 template <class reference_type>
 class WeakBase
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index 59c12a0864b1..0898cbfb38a1 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -270,7 +270,6 @@ typedef sal_Int64 WinBits;
 // DO NOT USE: 0x008000000000, that's WB_SYSTEMCHILDWINDOW
 #define WB_QUICK_SEARCH         ((WinBits)SAL_CONST_INT64(0x010000000000))
 
-
 // For FileOpen Dialog
 #define WB_PATH                 ((WinBits)0x00100000)
 #define WB_OPEN                 ((WinBits)0x00200000)
diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx
index 2fcf4a6d834d..b2c53a7b19d8 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/tools/inc/tools/zcodec.hxx
@@ -55,7 +55,6 @@ class SvStream;
 class TOOLS_DLLPUBLIC ZCodec
 {
 private:
-
     sal_uIntPtr         mbInit;
     sal_Bool            mbStatus;
     sal_Bool            mbFinish;
@@ -100,7 +99,6 @@ public:
 
 class GZCodec : public ZCodec
 {
-
 public:
                     GZCodec(){};
                     ~GZCodec(){};