re-indent falsely formatted code in tools/source

Change-Id: Ibc26313e79dd5f992c4bfb9454a9798fb1a78f00

16 files changed, 129 insertions, 137 deletions

diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx
index c148c26273c0..4027d16fce97 100644
--- a/tools/source/datetime/datetime.cxx
+++ b/tools/source/datetime/datetime.cxx
@@ -19,8 +19,7 @@
 #include <tools/datetime.hxx>
 #include <rtl/math.hxx>
 
-sal_Bool DateTime::IsBetween( const DateTime& rFrom,
-                          const DateTime& rTo ) const
+sal_Bool DateTime::IsBetween( const DateTime& rFrom, const DateTime& rTo ) const
 {
     if ( (*this >= rFrom) && (*this <= rTo) )
         return sal_True;
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 0d4f2a35dbc9..f49433a1c4ba 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -33,16 +33,14 @@ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
 #endif
 
 static sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
-                                   31, 31, 30, 31, 30, 31 };
+                                       31, 31, 30, 31, 30, 31 };
 
 #define MAX_DAYS    3636532
 
 inline sal_Bool ImpIsLeapYear( sal_uInt16 nYear )
 {
-    return (
-                 ( ((nYear % 4) == 0) && ((nYear % 100) != 0) ) ||
-                 ( (nYear % 400) == 0 )
-               );
+    return ( ( ((nYear % 4) == 0) && ((nYear % 100) != 0) ) ||
+             ( (nYear % 400) == 0 ) );
 }
 
 // All callers must have sanitized or normalized month and year values!
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index d6e9bbc07ede..1f30ef11cd68 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -52,7 +52,7 @@
 struct PBlock
 {
     void*       aData[PBLOCKCOUNT];
-    sal_uInt16      nCount;
+    sal_uInt16  nCount;
     PBlock*     pPrev;
     PBlock*     pNext;
 };
@@ -62,18 +62,18 @@ class PointerList
 private:
     PBlock*     pFirst;
     PBlock*     pLast;
-    sal_uIntPtr       nCount;
+    sal_uIntPtr nCount;
 
 public:
                 PointerList() { pFirst = NULL; pLast = NULL; nCount = 0; }
                 ~PointerList();
 
     void        Add( const void* p );
-    sal_Bool        Remove( const void* p );
+    sal_Bool    Remove( const void* p );
 
     const void* Get( sal_uIntPtr nPos ) const;
-    sal_Bool        IsIn( const void* p ) const;
-    sal_uIntPtr       Count() const { return nCount; }
+    sal_Bool    IsIn( const void* p ) const;
+    sal_uIntPtr Count() const { return nCount; }
 };
 
 // data types
@@ -82,31 +82,31 @@ public:
 
 struct ProfType
 {
-    sal_uIntPtr                   nCount;
-    sal_uIntPtr                   nTime;
-    sal_uIntPtr                   nMinTime;
-    sal_uIntPtr                   nMaxTime;
-    sal_uIntPtr                   nStart;
-    sal_uIntPtr                   nContinueTime;
-    sal_uIntPtr                   nContinueStart;
+    sal_uIntPtr             nCount;
+    sal_uIntPtr             nTime;
+    sal_uIntPtr             nMinTime;
+    sal_uIntPtr             nMaxTime;
+    sal_uIntPtr             nStart;
+    sal_uIntPtr             nContinueTime;
+    sal_uIntPtr             nContinueStart;
     sal_Char                aName[DBG_MAXNAME+1];
 };
 
 struct XtorType
 {
-    sal_uIntPtr                   nCtorCalls;
-    sal_uIntPtr                   nDtorCalls;
-    sal_uIntPtr                   nMaxCount;
-    sal_uIntPtr                   nStatics;
+    sal_uIntPtr             nCtorCalls;
+    sal_uIntPtr             nDtorCalls;
+    sal_uIntPtr             nMaxCount;
+    sal_uIntPtr             nStatics;
     sal_Char                aName[DBG_MAXNAME+1];
-    sal_Bool                    bTest;
+    sal_Bool                bTest;
     PointerList             aThisList;
 };
 
 struct DebugData
 {
     DbgData                 aDbgData;
-    sal_uInt16                  bInit;
+    sal_uInt16              bInit;
     DbgPrintLine            pDbgPrintMsgBox;
     DbgPrintLine            pDbgPrintWindow;
     DbgPrintLine            pDbgPrintTestTool;
@@ -164,7 +164,7 @@ static int bDbgImplInMain = sal_False;
 static CRITICAL_SECTION aImplCritDbgSection;
 #endif
 
-static sal_Bool             bImplCritDbgSectionInit = sal_False;
+static sal_Bool bImplCritDbgSectionInit = sal_False;
 
 void ImplDbgInitLock()
 {
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 6e730fb649c3..eae34a378555 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -51,8 +51,8 @@ struct DirReader_Impl
     DirEntry*   pParent;
     String      aPath;
     rtl::OString aBypass;
-    sal_Bool        bReady;
-    sal_Bool        bInUse;
+    sal_Bool    bReady;
+    sal_Bool    bInUse;
 
                 DirReader_Impl( Dir &rDir )
                 :   pDir( &rDir ),
@@ -83,9 +83,9 @@ struct DirReader_Impl
                 ~DirReader_Impl()
                 { if( pDosDir ) closedir( pDosDir ); }
 
-                // Init and Read are system-independent
-    sal_uInt16      Init(); // initializes (and if necessary reads devices)
-    sal_uInt16      Read(); // Reads one entry and appends it if ok
+    // Init and Read are system-independent
+    sal_uInt16  Init(); // Initializes (and if necessary) reads devices
+    sal_uInt16  Read(); // Reads one entry and appends it if ok
 };
 
 
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 3f5cc76c9fb0..8a729cc1a692 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -64,36 +64,36 @@ int Sys2SolarError_Impl( int nSysErr )
     switch ( nSysErr )
     {
 #ifdef WNT
-                case NO_ERROR:                                  return ERRCODE_NONE;
-                case ERROR_INVALID_FUNCTION:    return ERRCODE_IO_GENERAL;
-                case ERROR_FILE_NOT_FOUND:              return ERRCODE_IO_NOTEXISTS;
-                case ERROR_PATH_NOT_FOUND:              return ERRCODE_IO_NOTEXISTSPATH;
-                case ERROR_TOO_MANY_OPEN_FILES: return ERRCODE_IO_TOOMANYOPENFILES;
-                case ERROR_ACCESS_DENIED:               return ERRCODE_IO_ACCESSDENIED;
-                case ERROR_INVALID_HANDLE:              return ERRCODE_IO_GENERAL;
-                case ERROR_NOT_ENOUGH_MEMORY:   return ERRCODE_IO_OUTOFMEMORY;
-                case ERROR_INVALID_BLOCK:               return ERRCODE_IO_GENERAL;
-                case ERROR_BAD_FORMAT:                  return ERRCODE_IO_WRONGFORMAT;
-                case ERROR_INVALID_ACCESS:              return ERRCODE_IO_ACCESSDENIED;
-                case ERROR_INVALID_DRIVE:               return ERRCODE_IO_INVALIDDEVICE;
-                case ERROR_CURRENT_DIRECTORY:   return ERRCODE_IO_CURRENTDIR;
-                case ERROR_NOT_SAME_DEVICE:     return ERRCODE_IO_NOTSAMEDEVICE;
-                case ERROR_WRITE_PROTECT:               return ERRCODE_IO_CANTWRITE;
-                case ERROR_BAD_UNIT:                    return ERRCODE_IO_INVALIDDEVICE;
-                case ERROR_NOT_READY:                   return ERRCODE_IO_DEVICENOTREADY;
-                case ERROR_BAD_COMMAND:                 return ERRCODE_IO_GENERAL;
-                case ERROR_CRC:                                 return ERRCODE_IO_BADCRC;
-                case ERROR_BAD_LENGTH:                  return ERRCODE_IO_INVALIDLENGTH;
-                case ERROR_SEEK:                                return ERRCODE_IO_CANTSEEK;
-                case ERROR_NOT_DOS_DISK:                return ERRCODE_IO_WRONGFORMAT;
-                case ERROR_SECTOR_NOT_FOUND:    return ERRCODE_IO_GENERAL;
-                case ERROR_WRITE_FAULT:                 return ERRCODE_IO_CANTWRITE;
-                case ERROR_READ_FAULT:                  return ERRCODE_IO_CANTREAD;
-                case ERROR_GEN_FAILURE:                 return ERRCODE_IO_GENERAL;
-                case ERROR_SHARING_VIOLATION:   return ERRCODE_IO_LOCKVIOLATION;
-                case ERROR_LOCK_VIOLATION:              return ERRCODE_IO_LOCKVIOLATION;
-                case ERROR_WRONG_DISK:                  return ERRCODE_IO_INVALIDDEVICE;
-                case ERROR_NOT_SUPPORTED:               return ERRCODE_IO_NOTSUPPORTED;
+        case NO_ERROR:                  return ERRCODE_NONE;
+        case ERROR_INVALID_FUNCTION:    return ERRCODE_IO_GENERAL;
+        case ERROR_FILE_NOT_FOUND:      return ERRCODE_IO_NOTEXISTS;
+        case ERROR_PATH_NOT_FOUND:      return ERRCODE_IO_NOTEXISTSPATH;
+        case ERROR_TOO_MANY_OPEN_FILES: return ERRCODE_IO_TOOMANYOPENFILES;
+        case ERROR_ACCESS_DENIED:       return ERRCODE_IO_ACCESSDENIED;
+        case ERROR_INVALID_HANDLE:      return ERRCODE_IO_GENERAL;
+        case ERROR_NOT_ENOUGH_MEMORY:   return ERRCODE_IO_OUTOFMEMORY;
+        case ERROR_INVALID_BLOCK:       return ERRCODE_IO_GENERAL;
+        case ERROR_BAD_FORMAT:          return ERRCODE_IO_WRONGFORMAT;
+        case ERROR_INVALID_ACCESS:      return ERRCODE_IO_ACCESSDENIED;
+        case ERROR_INVALID_DRIVE:       return ERRCODE_IO_INVALIDDEVICE;
+        case ERROR_CURRENT_DIRECTORY:   return ERRCODE_IO_CURRENTDIR;
+        case ERROR_NOT_SAME_DEVICE:     return ERRCODE_IO_NOTSAMEDEVICE;
+        case ERROR_WRITE_PROTECT:       return ERRCODE_IO_CANTWRITE;
+        case ERROR_BAD_UNIT:            return ERRCODE_IO_INVALIDDEVICE;
+        case ERROR_NOT_READY:           return ERRCODE_IO_DEVICENOTREADY;
+        case ERROR_BAD_COMMAND:         return ERRCODE_IO_GENERAL;
+        case ERROR_CRC:                 return ERRCODE_IO_BADCRC;
+        case ERROR_BAD_LENGTH:          return ERRCODE_IO_INVALIDLENGTH;
+        case ERROR_SEEK:                return ERRCODE_IO_CANTSEEK;
+        case ERROR_NOT_DOS_DISK:        return ERRCODE_IO_WRONGFORMAT;
+        case ERROR_SECTOR_NOT_FOUND:    return ERRCODE_IO_GENERAL;
+        case ERROR_WRITE_FAULT:         return ERRCODE_IO_CANTWRITE;
+        case ERROR_READ_FAULT:          return ERRCODE_IO_CANTREAD;
+        case ERROR_GEN_FAILURE:         return ERRCODE_IO_GENERAL;
+        case ERROR_SHARING_VIOLATION:   return ERRCODE_IO_LOCKVIOLATION;
+        case ERROR_LOCK_VIOLATION:      return ERRCODE_IO_LOCKVIOLATION;
+        case ERROR_WRONG_DISK:          return ERRCODE_IO_INVALIDDEVICE;
+        case ERROR_NOT_SUPPORTED:       return ERRCODE_IO_NOTSUPPORTED;
 #else
         case 0:         return ERRCODE_NONE;
         case ENOENT:    return ERRCODE_IO_NOTEXISTS;
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index f2c71b7b5053..f96c50272f7f 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -30,8 +30,8 @@ DBG_NAME( Dir )
 
 /// determines whether insertion is required
 sal_Bool Dir::ImpInsertPointReached( const DirEntry& rNewEntry,
-                                 const FileStat& rNewStat,
-                                 size_t nCurPos, size_t nSortIndex ) const
+                                     const FileStat& rNewStat,
+                                     size_t nCurPos, size_t nSortIndex ) const
 {
 #define VALUE( nKindFlags ) \
     ( ( FSYS_KIND_FILE | FSYS_KIND_DIR | FSYS_KIND_DEV | \
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index c23be81de494..7a3f9dfc2f0a 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -177,7 +177,8 @@ TempFile::TempFile( const String* pParent, sal_Bool bDirectory )
     CreateTempName_Impl( pImp->aName, sal_True, bDirectory );
 }
 
-TempFile::TempFile( const String& rLeadingChars, const String* pExtension, const String* pParent, sal_Bool bDirectory )
+TempFile::TempFile( const String& rLeadingChars, const String* pExtension,
+                    const String* pParent, sal_Bool bDirectory )
     : pImp( new TempFile_Impl )
     , bKillingFileEnabled( sal_False )
 {
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 7accaff20810..00472a5bcd78 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -194,7 +194,7 @@ namespace { struct mymnt : public rtl::Static< mymnttab, mymnt > {}; }
 
 String DirEntry::GetVolume() const
 {
-  DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
+    DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
     DirEntry aPath( *this );
     aPath.ToAbs();
@@ -207,8 +207,7 @@ String DirEntry::GetVolume() const
         aPath = aPath [1];
     }
     mymnttab &rMnt = mymnt::get();
-    return ((buf.st_dev == rMnt.mountdevice ||
-                GetMountEntry(buf.st_dev, &rMnt)) ?
+    return ((buf.st_dev == rMnt.mountdevice || GetMountEntry(buf.st_dev, &rMnt)) ?
                     rtl::OStringToOUString(rMnt.mountspecial, osl_getThreadTextEncoding()) :
                     rtl::OUString());
 }
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 3924130476f9..428d4e078e60 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -585,10 +585,9 @@ void INetURLObject::setInvalid()
 
 namespace unnamed_tools_urlobj {
 
-INetURLObject::FSysStyle
-guessFSysStyleByCounting(sal_Unicode const * pBegin,
-                         sal_Unicode const * pEnd,
-                         INetURLObject::FSysStyle eStyle)
+INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin,
+                                                  sal_Unicode const * pEnd,
+                                                  INetURLObject::FSysStyle eStyle)
 {
     DBG_ASSERT(eStyle
                    & (INetURLObject::FSYS_UNX
@@ -2101,9 +2100,8 @@ bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef,
 }
 
 // static
-INetURLObject::PrefixInfo const *
-INetURLObject::getPrefix(sal_Unicode const *& rBegin,
-                         sal_Unicode const * pEnd)
+INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& rBegin,
+                                                           sal_Unicode const * pEnd)
 {
     static PrefixInfo const aMap[]
         = { // dummy entry at front needed, because pLast may point here:
@@ -2384,8 +2382,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword,
 }
 
 // static
-bool INetURLObject::parseHost(
-    sal_Unicode const *& rBegin, sal_Unicode const * pEnd,
+bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * pEnd,
     rtl::OUString & rCanonic)
 {
     // RFC 2373 is inconsistent about how to write an IPv6 address in which an
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 97eb0d2b78aa..bb8ec2c9e0e8 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -93,7 +93,9 @@ void B3dTransformationSet::Frustum(basegfx::B3DHomMatrix& rTarget, double fLeft,
     rTarget *= aTemp;
 }
 
-void B3dTransformationSet::Ortho(basegfx::B3DHomMatrix& rTarget, double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar)
+void B3dTransformationSet::Ortho(basegfx::B3DHomMatrix& rTarget,
+                                 double fLeft, double fRight, double fBottom, double fTop,
+                                 double fNear, double fFar)
 {
     if(fNear == fFar)
     {
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 9cc4a4d5b56d..c590f6b4ab64 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -369,15 +369,15 @@ static void ImplMakeConfigList( ImplConfigData* pData,
 
 static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr& rLen )
 {
-    sal_uInt8*          pWriteBuf;
-    sal_uInt8*          pBuf;
-    sal_uInt8           aLineEndBuf[2] = {0, 0};
+    sal_uInt8*      pWriteBuf;
+    sal_uInt8*      pBuf;
+    sal_uInt8       aLineEndBuf[2] = {0, 0};
     ImplKeyData*    pKey;
     ImplGroupData*  pGroup;
     unsigned int    nBufLen;
-    sal_uInt32          nValueLen;
-    sal_uInt32          nKeyLen;
-    sal_uInt32          nLineEndLen;
+    sal_uInt32      nValueLen;
+    sal_uInt32      nKeyLen;
+    sal_uInt32      nLineEndLen;
 
     if ( pData->meLineEnd == LINEEND_CR )
     {
@@ -520,11 +520,11 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
 
 static void ImplReadConfig( ImplConfigData* pData )
 {
-    sal_uIntPtr         nTimeStamp = 0;
-    sal_uInt64 nRead = 0;
-    sal_Bool            bRead = sal_False;
-    sal_Bool                bIsUTF8BOM =sal_False;
-    sal_uInt8*          pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp );
+    sal_uIntPtr nTimeStamp = 0;
+    sal_uInt64  nRead = 0;
+    sal_Bool    bRead = sal_False;
+    sal_Bool    bIsUTF8BOM =sal_False;
+    sal_uInt8*  pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp );
 
     // Aus dem Buffer die Config-Verwaltungsliste aufbauen
     if ( pBuf )
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index bf248ca48197..cf0a017f8d41 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -458,8 +458,8 @@ Polygon::Polygon( const Point& rCenter, long nRadX, long nRadY, sal_uInt16 nPoin
         mpImplPolygon = (ImplPolygon*)(&aStaticImplPolygon);
 }
 
-Polygon::Polygon( const Rectangle& rBound,
-                  const Point& rStart, const Point& rEnd, PolyStyle eStyle, sal_Bool bFullCircle )
+Polygon::Polygon( const Rectangle& rBound, const Point& rStart, const Point& rEnd,
+                  PolyStyle eStyle, sal_Bool bFullCircle )
 {
     DBG_CTOR( Polygon, NULL );
 
@@ -471,7 +471,7 @@ Polygon::Polygon( const Rectangle& rBound,
         const Point aCenter( rBound.Center() );
         const long  nRadX = aCenter.X() - rBound.Left();
         const long  nRadY = aCenter.Y() - rBound.Top();
-        sal_uInt16      nPoints;
+        sal_uInt16  nPoints;
 
         nPoints = (sal_uInt16) ( F_PI * ( 1.5 * ( nRadX + nRadY ) -
                              sqrt( (double) labs( nRadX * nRadY ) ) ) );
@@ -490,8 +490,8 @@ Polygon::Polygon( const Rectangle& rBound,
         double          fEnd = ImplGetParameter( aCenter, rEnd, fRadX, fRadY );
         double          fDiff = fEnd - fStart;
         double          fStep;
-        sal_uInt16          nStart;
-        sal_uInt16          nEnd;
+        sal_uInt16      nStart;
+        sal_uInt16      nEnd;
 
         if( fDiff < 0. )
             fDiff += F_2PI;
@@ -655,12 +655,12 @@ sal_Bool Polygon::IsRect() const
     if ( mpImplPolygon->mpFlagAry == NULL )
     {
         if ( ( ( mpImplPolygon->mnPoints == 5 ) && ( mpImplPolygon->mpPointAry[ 0 ] == mpImplPolygon->mpPointAry[ 4 ] ) ) ||
-                ( mpImplPolygon->mnPoints == 4 ) )
+             ( mpImplPolygon->mnPoints == 4 ) )
         {
             if ( ( mpImplPolygon->mpPointAry[ 0 ].X() == mpImplPolygon->mpPointAry[ 3 ].X() ) &&
-                    ( mpImplPolygon->mpPointAry[ 0 ].Y() == mpImplPolygon->mpPointAry[ 1 ].Y() ) &&
-                        ( mpImplPolygon->mpPointAry[ 1 ].X() == mpImplPolygon->mpPointAry[ 2 ].X() ) &&
-                            ( mpImplPolygon->mpPointAry[ 2 ].Y() == mpImplPolygon->mpPointAry[ 3 ].Y() ) )
+                 ( mpImplPolygon->mpPointAry[ 0 ].Y() == mpImplPolygon->mpPointAry[ 1 ].Y() ) &&
+                 ( mpImplPolygon->mpPointAry[ 1 ].X() == mpImplPolygon->mpPointAry[ 2 ].X() ) &&
+                 ( mpImplPolygon->mpPointAry[ 2 ].Y() == mpImplPolygon->mpPointAry[ 3 ].Y() ) )
                 bIsRect = sal_True;
         }
     }
@@ -925,7 +925,8 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
 void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent )
 {
     const double    fBound = 2000.0 * ( 100 - nPercent ) * 0.01;
-    sal_uInt16          nNumNoChange = 0, nNumRuns = 0;
+    sal_uInt16      nNumNoChange = 0,
+                    nNumRuns = 0;
 
     while( nNumNoChange < 2 )
     {
@@ -1109,7 +1110,7 @@ class ImplPolygonPointFilter : public ImplPointFilter
 {
 public:
     ImplPolygon*    mpPoly;     // Nicht loeschen, wird dem Polygon zugewiesen
-    sal_uInt16          mnSize;
+    sal_uInt16      mnSize;
 
                     ImplPolygonPointFilter( sal_uInt16 nDestSize ) :
                         mnSize( 0 )
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 57a1f85a6981..4619858c8c59 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -205,8 +205,7 @@ void INetMIMECharsetList_Impl::includes(sal_uInt32 nChar)
             p->m_bDisabled = true;
 }
 
-rtl_TextEncoding
-INetMIMECharsetList_Impl::getPreferredEncoding(rtl_TextEncoding eDefault)
+rtl_TextEncoding INetMIMECharsetList_Impl::getPreferredEncoding(rtl_TextEncoding eDefault)
     const
 {
     for (Node * p = m_pFirst; p; p = p->m_pNext)
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 321e202bde59..37584d0ebed4 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -39,18 +39,18 @@ class INetMessageEncodeQPStream_Impl : public INetMessageIStream
 {
     SvStream               *pMsgStrm;
 
-    sal_uIntPtr                   nMsgBufSiz;
+    sal_uIntPtr             nMsgBufSiz;
     sal_Char               *pMsgBuffer;
     sal_Char               *pMsgRead;
     sal_Char               *pMsgWrite;
 
-    sal_uIntPtr                   nTokBufSiz;
+    sal_uIntPtr             nTokBufSiz;
     sal_Char               *pTokBuffer;
     sal_Char               *pTokRead;
     sal_Char               *pTokWrite;
 
     INetMessageStreamState  eState;
-    sal_Bool                    bDone;
+    sal_Bool                bDone;
 
     virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize);
 
@@ -65,7 +65,7 @@ class INetMessageDecodeQPStream_Impl : public INetMessageOStream
     INetMessageStreamState  eState;
     SvMemoryStream         *pMsgBuffer;
 
-    sal_uIntPtr                   nTokBufLen;
+    sal_uIntPtr             nTokBufLen;
     sal_Char                pTokBuffer[4];
 
     virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize);
@@ -78,19 +78,19 @@ public:
 /** Base64 Encoding */
 class INetMessageEncode64Stream_Impl : public INetMessageIStream
 {
-    SvStream  *pMsgStrm;
+    SvStream    *pMsgStrm;
 
-    sal_uIntPtr      nMsgBufSiz;
-    sal_uInt8 *pMsgBuffer;
-    sal_uInt8 *pMsgRead;
-    sal_uInt8 *pMsgWrite;
+    sal_uIntPtr  nMsgBufSiz;
+    sal_uInt8   *pMsgBuffer;
+    sal_uInt8   *pMsgRead;
+    sal_uInt8   *pMsgWrite;
 
-    sal_uIntPtr      nTokBufSiz;
-    sal_Char  *pTokBuffer;
-    sal_Char  *pTokRead;
-    sal_Char  *pTokWrite;
+    sal_uIntPtr  nTokBufSiz;
+    sal_Char    *pTokBuffer;
+    sal_Char    *pTokRead;
+    sal_Char    *pTokWrite;
 
-    sal_Bool       bDone;
+    sal_Bool     bDone;
 
     virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize);
 
@@ -104,7 +104,7 @@ class INetMessageDecode64Stream_Impl : public INetMessageOStream
 {
     INetMessageStreamState  eState;
 
-    sal_uIntPtr                   nMsgBufSiz;
+    sal_uIntPtr             nMsgBufSiz;
     sal_Char               *pMsgBuffer;
     sal_Char               *pMsgRead;
     sal_Char               *pMsgWrite;
@@ -472,8 +472,7 @@ static const sal_Char ebcdic[] = {
     '!', '"', '#', '$', '@', '[', '\\', ']', '^', '`', '{', '|', '}', '~'
 };
 
-INetMessageEncodeQPStream_Impl::INetMessageEncodeQPStream_Impl (
-    sal_uIntPtr nMsgBufferSize)
+INetMessageEncodeQPStream_Impl::INetMessageEncodeQPStream_Impl( sal_uIntPtr nMsgBufferSize)
     : INetMessageIStream (),
       pMsgStrm   (NULL),
       nMsgBufSiz (nMsgBufferSize),
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 3188989610a7..1e4caf837453 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -77,11 +77,11 @@ class InternalResMgr
     friend class ResMgrContainer;
 
     ImpContent *                    pContent;
-    sal_uInt32                          nOffCorrection;
-    sal_uInt8 *                         pStringBlock;
+    sal_uInt32                      nOffCorrection;
+    sal_uInt8                       pStringBlock;
     SvStream *                      pStm;
-    sal_Bool                            bEqual2Content;
-    sal_uInt32                          nEntries;
+    sal_Bool                        bEqual2Content;
+    sal_uInt32                      nEntries;
     OUString                        aFileName;
     OUString                        aPrefix;
     OUString                        aResName;
@@ -94,13 +94,13 @@ class InternalResMgr
                                             const OUString& aResName,
                                             const com::sun::star::lang::Locale& rLocale );
                             ~InternalResMgr();
-    sal_Bool                    Create();
+    sal_Bool                Create();
 
-    sal_Bool                    IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const;
+    sal_Bool                IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const;
     void *                  LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
                                            void **pResHandle );
 public:
-    static void                 FreeGlobalRes( void *, void * );
+    static void             FreeGlobalRes( void *, void * );
 };
 
 class ResMgrContainer
@@ -128,8 +128,8 @@ class ResMgrContainer
     ~ResMgrContainer();
 
     void init();
-    public:
 
+public:
     static ResMgrContainer& get();
     static void release();
 
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 4ef4a4720ff6..93d1c72f068b 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -32,16 +32,14 @@ typedef void (* DisplayFnPtr)();
 
 struct EDcrData
 {
-  public:
-
+public:
     ErrorHandler               *pFirstHdl;
     ErrorContext               *pFirstCtx;
     DisplayFnPtr               pDsp;
-    sal_Bool                       bIsWindowDsp;
-
+    sal_Bool                   bIsWindowDsp;
 
     DynamicErrorInfo            *ppDcr[ERRCODE_DYNAMIC_COUNT];
-    sal_uInt16                      nNextDcr;
+    sal_uInt16                  nNextDcr;
                                 EDcrData();
 
 static  EDcrData                *GetData();
@@ -49,8 +47,8 @@ static  EDcrData                *GetData();
 
 class EDcr_Impl
 {
-    sal_uIntPtr                       lErrId;
-    sal_uInt16                      nMask;
+    sal_uIntPtr                 lErrId;
+    sal_uInt16                  nMask;
 
     void                        RegisterEDcr(DynamicErrorInfo *);
     void                        UnRegisterEDcr(DynamicErrorInfo *);
@@ -176,8 +174,7 @@ StringErrorInfo::StringErrorInfo(
 
 class ErrHdl_Impl
 {
-  public:
-
+public:
     ErrorHandler        *pNext;
     static sal_Bool         CreateString(const ErrorHandler *pStart,
                                      const ErrorInfo*, String&, sal_uInt16&);
@@ -382,8 +379,8 @@ sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags)
 }
 
 sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart,
-                                const ErrorInfo* pInfo, String& pStr,
-                               sal_uInt16 &rFlags)
+                                    const ErrorInfo* pInfo, String& pStr,
+                                    sal_uInt16 &rFlags)
 {
     for(const ErrorHandler *pHdl=pStart;pHdl;pHdl=pHdl->pImpl->pNext)
     {