diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /vcl/unx/generic/gdi | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 76 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 40 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.cxx | 6 |
5 files changed, 65 insertions, 65 deletions
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 49ba13ee747c..44e82c5b44c9 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -35,7 +35,7 @@ X11GlyphPeer::X11GlyphPeer() { } -// --------------------------------------------------------------------------- + X11GlyphPeer::~X11GlyphPeer() { @@ -69,7 +69,7 @@ X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer ) { } -// --------------------------------------------------------------------------- + namespace { @@ -111,7 +111,7 @@ X11GlyphCache& X11GlyphCache::GetInstance() return theGlyphCacheHolder::get().getGlyphCache(); } -// --------------------------------------------------------------------------- + void X11GlyphCache::KillInstance() { diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 00538b00f9fe..d748e6a94ce6 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -48,9 +48,9 @@ #include <valgrind/memcheck.h> #endif -// ------------- + // - SalBitmap - -// ------------- + SalBitmap* X11SalInstance::CreateSalBitmap() { @@ -60,7 +60,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap() ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; sal_uLong X11SalBitmap::mnCacheInstCount = 0; -// ----------------------------------------------------------------------------- + X11SalBitmap::X11SalBitmap() : mpDIB( NULL ) @@ -69,14 +69,14 @@ X11SalBitmap::X11SalBitmap() { } -// ----------------------------------------------------------------------------- + X11SalBitmap::~X11SalBitmap() { Destroy(); } -// ----------------------------------------------------------------------------- + void X11SalBitmap::ImplCreateCache() { @@ -84,7 +84,7 @@ void X11SalBitmap::ImplCreateCache() mpCache = new ImplSalBitmapCache; } -// ----------------------------------------------------------------------------- + void X11SalBitmap::ImplDestroyCache() { @@ -94,7 +94,7 @@ void X11SalBitmap::ImplDestroyCache() delete mpCache, mpCache = NULL; } -// ----------------------------------------------------------------------------- + void X11SalBitmap::ImplRemovedFromCache() { @@ -120,7 +120,7 @@ namespace } #endif -// ----------------------------------------------------------------------------- + BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, @@ -211,7 +211,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } -// ----------------------------------------------------------------------------- + BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, @@ -386,7 +386,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } -// ----------------------------------------------------------------------------- + XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, @@ -562,7 +562,7 @@ XImage* X11SalBitmap::ImplCreateXImage( return pImage; } -// ----------------------------------------------------------------------------- + bool X11SalBitmap::ImplCreateFromDrawable( Drawable aDrawable, SalX11Screen nScreen, @@ -579,7 +579,7 @@ bool X11SalBitmap::ImplCreateFromDrawable( return( mpDDB != NULL ); } -// ----------------------------------------------------------------------------- + ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable, @@ -678,7 +678,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( return mpDDB; } -// ----------------------------------------------------------------------------- + void X11SalBitmap::ImplDraw( Drawable aDrawable, @@ -693,7 +693,7 @@ void X11SalBitmap::ImplDraw( mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC ); } -// ----------------------------------------------------------------------------- + bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { @@ -703,7 +703,7 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return( mpDIB != NULL ); } -// ----------------------------------------------------------------------------- + bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) { @@ -744,21 +744,21 @@ 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, @@ -799,7 +799,7 @@ bool X11SalBitmap::Create( return false; } -// ----------------------------------------------------------------------------- + void X11SalBitmap::Destroy() { @@ -816,7 +816,7 @@ void X11SalBitmap::Destroy() mpCache->ImplRemove( this ); } -// ----------------------------------------------------------------------------- + Size X11SalBitmap::GetSize() const { @@ -830,7 +830,7 @@ Size X11SalBitmap::GetSize() const return aSize; } -// ----------------------------------------------------------------------------- + sal_uInt16 X11SalBitmap::GetBitCount() const { @@ -846,7 +846,7 @@ sal_uInt16 X11SalBitmap::GetBitCount() const return nBitCount; } -// ----------------------------------------------------------------------------- + BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) { @@ -866,7 +866,7 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) return mpDIB; } -// ----------------------------------------------------------------------------- + void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) { @@ -880,7 +880,7 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) } } -// ----------------------------------------------------------------------------- + bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) { @@ -898,9 +898,9 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) return false; } -// -------------- + // - ImplSalDDB - -// -------------- + ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, SalX11Screen nXScreen, const SalTwoRect& rTwoRect ) @@ -932,7 +932,7 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, } } -// ----------------------------------------------------------------------------- + ImplSalDDB::ImplSalDDB( Drawable aDrawable, @@ -973,7 +973,7 @@ ImplSalDDB::ImplSalDDB( } } -// ----------------------------------------------------------------------------- + ImplSalDDB::~ImplSalDDB() { @@ -981,7 +981,7 @@ ImplSalDDB::~ImplSalDDB() XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap ); } -// ----------------------------------------------------------------------------- + bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const { @@ -1017,7 +1017,7 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe return bRet; } -// ----------------------------------------------------------------------------- + void ImplSalDDB::ImplDraw( Drawable aDrawable, @@ -1032,7 +1032,7 @@ void ImplSalDDB::ImplDraw( rTwoRect.mnDestX, rTwoRect.mnDestY, rGC ); } -// ----------------------------------------------------------------------------- + void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, @@ -1062,9 +1062,9 @@ void ImplSalDDB::ImplDraw( } } -// ---------------------- + // - ImplSalBitmapCache - -// ---------------------- + struct ImplBmpObj { @@ -1076,21 +1076,21 @@ 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 ) { @@ -1118,7 +1118,7 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) ); } -// ----------------------------------------------------------------------------- + void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) { @@ -1138,7 +1138,7 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) } } -// ----------------------------------------------------------------------------- + void ImplSalBitmapCache::ImplClear() { diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 3daf71bbae57..e4b853f2eb99 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -423,7 +423,7 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry, } } -// -------------------------------------------------------------------------- + void X11SalGraphics::copyArea ( long nDestX, long nDestY, long nSrcX, long nSrcY, diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index e0e1ff4bcc2a..7f40deb81377 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -91,11 +91,11 @@ struct _XRegion BOX extents; }; -// ---------------------------------------------------------------------------- + // // X11SalGraphics // -// ---------------------------------------------------------------------------- + GC X11SalGraphics::GetFontGC() @@ -124,7 +124,7 @@ X11SalGraphics::GetFontGC() return pFontGC_; } -//-------------------------------------------------------------------------- + bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel ) { @@ -194,7 +194,7 @@ void ImplServerFontEntry::HandleFontOptions( void ) mpServerFont->SetFontOptions( mpFontOptions ); } -//-------------------------------------------------------------------------- + CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts; int CairoFontsCache::mnRefCount = 0; @@ -449,7 +449,7 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) cairo_destroy(cr); } -//-------------------------------------------------------------------------- + const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const { @@ -467,11 +467,11 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities); } -// ---------------------------------------------------------------------------- + // // SalGraphics // -// ---------------------------------------------------------------------------- + sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) { @@ -483,7 +483,7 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve return nRetVal; } -// ---------------------------------------------------------------------------- + void X11SalGraphics::SetTextColor( SalColor nSalColor ) @@ -496,7 +496,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) } } -// ---------------------------------------------------------------------------- + bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, const OUString& rFileURL, const OUString& rFontName ) @@ -575,7 +575,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList ) ImplGetSVData()->maGDIData.mbNativeFontConfig = true; } -// ---------------------------------------------------------------------------- + void cairosubcallback(void* pPattern) { @@ -600,7 +600,7 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in return rPFM.getFontOptions(aInfo, nSize, cairosubcallback); } -// ---------------------------------------------------------------------------- + void X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) @@ -615,7 +615,7 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) } } -// --------------------------------------------------------------------------- + bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { @@ -647,7 +647,7 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } -// --------------------------------------------------------------------------- + bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rPolyPoly ) @@ -667,7 +667,7 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return false; } -//-------------------------------------------------------------------------- + SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) { @@ -691,7 +691,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pLayout; } -//-------------------------------------------------------------------------- + SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const { @@ -716,7 +716,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const return aSysFontData; } -//-------------------------------------------------------------------------- + bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, @@ -746,7 +746,7 @@ bool X11SalGraphics::CreateFontSubset( return bSuccess; } -//-------------------------------------------------------------------------- + const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ) { @@ -759,14 +759,14 @@ const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, con return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen ); } -//-------------------------------------------------------------------------- + void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen ) { GenPspGraphics::DoFreeEmbedFontData( pData, nLen ); } -//-------------------------------------------------------------------------- + const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { @@ -779,7 +779,7 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } -//-------------------------------------------------------------------------- + void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index 75fb57f02cee..03974a859caf 100644 --- a/vcl/unx/generic/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -29,7 +29,7 @@ using namespace rtl; -// --------------------------------------------------------------------------- + XRenderPeer::XRenderPeer() : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() ) @@ -38,7 +38,7 @@ XRenderPeer::XRenderPeer() InitRenderLib(); } -// --------------------------------------------------------------------------- + XRenderPeer& XRenderPeer::GetInstance() { @@ -46,7 +46,7 @@ XRenderPeer& XRenderPeer::GetInstance() return aPeer; } -// --------------------------------------------------------------------------- + void XRenderPeer::InitRenderLib() { |