diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:45:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:54:18 +0300 |
commit | 50bf123ddbeb457b89636621a99c971834adf3ab (patch) | |
tree | b7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/unx/generic/gdi/salbmp.cxx | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/unx/generic/gdi/salbmp.cxx')
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 7e7aef3cf911..0b1c5bd0df6f 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <errno.h> @@ -52,7 +51,6 @@ // - SalBitmap - - SalBitmap* X11SalInstance::CreateSalBitmap() { return new X11SalBitmap(); @@ -61,8 +59,6 @@ SalBitmap* X11SalInstance::CreateSalBitmap() ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; sal_uLong X11SalBitmap::mnCacheInstCount = 0; - - X11SalBitmap::X11SalBitmap() : mpDIB( NULL ) , mpDDB( NULL ) @@ -70,23 +66,17 @@ X11SalBitmap::X11SalBitmap() { } - - X11SalBitmap::~X11SalBitmap() { Destroy(); } - - void X11SalBitmap::ImplCreateCache() { if( !mnCacheInstCount++ ) mpCache = new ImplSalBitmapCache; } - - void X11SalBitmap::ImplDestroyCache() { DBG_ASSERT( mnCacheInstCount, "X11SalBitmap::ImplDestroyCache(): underflow" ); @@ -95,8 +85,6 @@ void X11SalBitmap::ImplDestroyCache() delete mpCache, mpCache = NULL; } - - void X11SalBitmap::ImplRemovedFromCache() { if( mpDDB ) @@ -121,8 +109,6 @@ namespace } #endif - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, @@ -212,8 +198,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, SalX11Screen nScreen, @@ -387,8 +371,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, SalX11Screen nScreen, @@ -563,7 +545,6 @@ XImage* X11SalBitmap::ImplCreateXImage( return pImage; } - bool X11SalBitmap::ImplCreateFromDrawable( Drawable aDrawable, SalX11Screen nScreen, @@ -581,7 +562,6 @@ bool X11SalBitmap::ImplCreateFromDrawable( return( mpDDB != NULL ); } - ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -679,8 +659,6 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( return mpDDB; } - - void X11SalBitmap::ImplDraw( Drawable aDrawable, SalX11Screen nXScreen, @@ -694,8 +672,6 @@ void X11SalBitmap::ImplDraw( mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC ); } - - bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { Destroy(); @@ -704,8 +680,6 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return( mpDIB != NULL ); } - - bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) { Destroy(); @@ -745,22 +719,16 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) ( rSalBmp.mpDDB && ( mpDDB != NULL ) ) ); } - - bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* ) { return false; } - - bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 ) { return false; } - - bool X11SalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& rSize, @@ -800,8 +768,6 @@ bool X11SalBitmap::Create( return false; } - - void X11SalBitmap::Destroy() { if( mpDIB ) @@ -817,8 +783,6 @@ void X11SalBitmap::Destroy() mpCache->ImplRemove( this ); } - - Size X11SalBitmap::GetSize() const { Size aSize; @@ -831,8 +795,6 @@ Size X11SalBitmap::GetSize() const return aSize; } - - sal_uInt16 X11SalBitmap::GetBitCount() const { sal_uInt16 nBitCount; @@ -847,8 +809,6 @@ sal_uInt16 X11SalBitmap::GetBitCount() const return nBitCount; } - - BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) { if( !mpDIB && mpDDB ) @@ -867,8 +827,6 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) return mpDIB; } - - void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) { if( !bReadOnly ) @@ -881,8 +839,6 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) } } - - bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) { if( mpDDB ) @@ -899,10 +855,8 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) return false; } - // - ImplSalDDB - - ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, SalX11Screen nXScreen, const SalTwoRect& rTwoRect ) : maPixmap ( 0 ) @@ -933,8 +887,6 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, } } - - ImplSalDDB::ImplSalDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -974,16 +926,12 @@ ImplSalDDB::ImplSalDDB( } } - - ImplSalDDB::~ImplSalDDB() { if( maPixmap && ImplGetSVData() ) XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap ); } - - bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const { bool bRet = false; @@ -1018,8 +966,6 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe return bRet; } - - void ImplSalDDB::ImplDraw( Drawable aDrawable, long nDrawableDepth, @@ -1033,8 +979,6 @@ void ImplSalDDB::ImplDraw( rTwoRect.mnDestX, rTwoRect.mnDestY, rGC ); } - - void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth, @@ -1063,10 +1007,8 @@ void ImplSalDDB::ImplDraw( } } - // - ImplSalBitmapCache - - struct ImplBmpObj { X11SalBitmap* mpBmp; @@ -1077,22 +1019,16 @@ struct ImplBmpObj mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {} }; - - ImplSalBitmapCache::ImplSalBitmapCache() : mnTotalSize( 0UL ) { } - - ImplSalBitmapCache::~ImplSalBitmapCache() { ImplClear(); } - - void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags ) { ImplBmpObj* pObj = NULL; @@ -1119,8 +1055,6 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) ); } - - void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) { for( @@ -1139,8 +1073,6 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) } } - - void ImplSalBitmapCache::ImplClear() { for( |