Cosmetics and style cleanups

Change-Id: I45b072e5d6a216f0b82f7a0b3a4554ef4cc3570f

2 files changed, 11 insertions, 49 deletions

diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index b29cabe6562a..31b6e4329b09 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -23,58 +23,43 @@
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 
-// ---------------
-// - ImpBitmap -
-// ---------------
-
 struct BitmapBuffer;
 class SalBitmap;
 class BitmapPalette;
 class SalGraphics;
 class Bitmap;
-class OutputDevice;
-class Color;
-class AlphaMask;
 
 class ImpBitmap
 {
 private:
-
-    sal_uLong               mnRefCount;
-    sal_uLong               mnChecksum;
+    sal_uLong           mnRefCount;
+    sal_uLong           mnChecksum;
     SalBitmap*          mpSalBitmap;
 
 public:
-
                         ImpBitmap();
                         ~ImpBitmap();
 
-public:
-
     void                ImplSetSalBitmap( SalBitmap* pSalBitmap );
     SalBitmap*          ImplGetSalBitmap() const { return mpSalBitmap; }
 
-public:
-
-    sal_Bool                ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
-    sal_Bool                ImplCreate( const ImpBitmap& rImpBitmap );
-    sal_Bool                ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
-    sal_Bool                ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
+    sal_Bool            ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
+    sal_Bool            ImplCreate( const ImpBitmap& rImpBitmap );
+    sal_Bool            ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics );
+    sal_Bool            ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
 
     Size                ImplGetSize() const;
-    sal_uInt16              ImplGetBitCount() const;
+    sal_uInt16          ImplGetBitCount() const;
 
     BitmapBuffer*       ImplAcquireBuffer( sal_Bool bReadOnly );
     void                ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly );
 
-public:
-
-    sal_uLong               ImplGetRefCount() const { return mnRefCount; }
+    sal_uLong           ImplGetRefCount() const { return mnRefCount; }
     void                ImplIncRefCount() { mnRefCount++; }
     void                ImplDecRefCount() { mnRefCount--; }
 
     inline void         ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; }
-    inline sal_uLong        ImplGetChecksum() const { return mnChecksum; }
+    inline sal_uLong    ImplGetChecksum() const { return mnChecksum; }
 };
 
 #endif // INCLUDED_VCL_INC_IMPBMP_HXX
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 7181c0dc8483..852f21110998 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -25,83 +25,60 @@
 #include <salbmp.hxx>
 #include <impbmp.hxx>
 
-// --------------
-// - ImpBitmap  -
-// --------------
-
 ImpBitmap::ImpBitmap() :
-            mnRefCount  ( 1UL ),
-            mnChecksum  ( 0UL ),
+            mnRefCount  ( 1 ),
+            mnChecksum  ( 0 ),
             mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() )
 {
 }
 
-// -----------------------------------------------------------------------
-
 ImpBitmap::~ImpBitmap()
 {
     delete mpSalBitmap;
 }
 
-// -----------------------------------------------------------------------
 void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap )
 {
     delete mpSalBitmap, mpSalBitmap = pBitmap;
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
     return mpSalBitmap->Create( rSize, nBitCount, rPal );
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap )
 {
     mnChecksum = rImpBitmap.mnChecksum;
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap );
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics )
 {
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, pGraphics );
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount )
 {
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, nNewBitCount );
 }
 
-// -----------------------------------------------------------------------
-
 Size ImpBitmap::ImplGetSize() const
 {
     return mpSalBitmap->GetSize();
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 ImpBitmap::ImplGetBitCount() const
 {
     sal_uInt16 nBitCount = mpSalBitmap->GetBitCount();
     return( ( nBitCount <= 1 ) ? 1 : ( nBitCount <= 4 ) ? 4 : ( nBitCount <= 8 ) ? 8 : 24 );
 }
 
-// -----------------------------------------------------------------------
-
 BitmapBuffer* ImpBitmap::ImplAcquireBuffer( sal_Bool bReadOnly )
 {
     return mpSalBitmap->AcquireBuffer( bReadOnly );
 }
 
-// -----------------------------------------------------------------------
-
 void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly )
 {
     mpSalBitmap->ReleaseBuffer( pBuffer, bReadOnly );