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/quartz | |
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/quartz')
-rw-r--r-- | vcl/quartz/ctfonts.cxx | 26 | ||||
-rw-r--r-- | vcl/quartz/salbmp.cxx | 40 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 44 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salgdiutils.cxx | 12 | ||||
-rw-r--r-- | vcl/quartz/salvd.cxx | 16 |
6 files changed, 70 insertions, 70 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 72399399d282..ea89b5318f8d 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -106,7 +106,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) #endif } -// ----------------------------------------------------------------------- + CoreTextStyle::~CoreTextStyle( void ) { @@ -114,7 +114,7 @@ CoreTextStyle::~CoreTextStyle( void ) CFRelease( mpStyleDict ); } -// ----------------------------------------------------------------------- + void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const { @@ -136,7 +136,7 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const rMetric.mbKernableFont = true; } -// ----------------------------------------------------------------------- + bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) const { @@ -154,7 +154,7 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } -// ----------------------------------------------------------------------- + // callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline() struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; }; @@ -216,7 +216,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg return true; } -// ----------------------------------------------------------------------- + void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) { @@ -235,21 +235,21 @@ PhysicalFontFace* CoreTextFontData::Clone( void ) const return new CoreTextFontData( *this); } -// ----------------------------------------------------------------------- + CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern& rFSD ) const { return new CoreTextStyle( rFSD); } -// ----------------------------------------------------------------------- + ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD ) const { return new ImplFontEntry( rFSD); } -// ----------------------------------------------------------------------- + int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf ) const { @@ -424,7 +424,7 @@ SystemFontList::SystemFontList() , mpCTFontArray( NULL ) {} -// ----------------------------------------------------------------------- + SystemFontList::~SystemFontList() { @@ -439,7 +439,7 @@ SystemFontList::~SystemFontList() CFRelease( mpCTFontCollection ); } -// ----------------------------------------------------------------------- + void SystemFontList::AddFont( CoreTextFontData* pFontData ) { @@ -447,7 +447,7 @@ void SystemFontList::AddFont( CoreTextFontData* pFontData ) maFontContainer[ nFontId ] = pFontData; } -// ----------------------------------------------------------------------- + void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const { @@ -456,7 +456,7 @@ void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const rFontList.Add( (*it).second->Clone() ); } -// ----------------------------------------------------------------------- + CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const { @@ -466,7 +466,7 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const return (*it).second; } -// ----------------------------------------------------------------------- + bool SystemFontList::Init( void ) { diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 98a6938bf5fd..a30a22b1c4d1 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -66,14 +66,14 @@ QuartzSalBitmap::QuartzSalBitmap() { } -// ------------------------------------------------------------------ + QuartzSalBitmap::~QuartzSalBitmap() { Destroy(); } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, int nX, int nY, int nWidth, int nHeight ) @@ -108,7 +108,7 @@ bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, return true; } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( CGImageRef xImage, int nBitmapBits, int nX, int nY, int nWidth, int nHeight ) @@ -177,7 +177,7 @@ bool QuartzSalBitmap::Create( BitmapBuffer& buffer) return true; } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rBitmapPalette ) { @@ -190,21 +190,21 @@ bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapP return AllocateUserData(); } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp ) { return Create( rSalBmp, rSalBmp.GetBitCount() ); } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) { return Create( rSalBmp, pGraphics ? pGraphics->GetBitCount() : rSalBmp.GetBitCount() ); } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) { @@ -226,14 +226,14 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount return false; } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) { return false; } -// ------------------------------------------------------------------ + void QuartzSalBitmap::Destroy() { @@ -242,7 +242,7 @@ void QuartzSalBitmap::Destroy() maExternalData = NULL; } -// ------------------------------------------------------------------ + void QuartzSalBitmap::DestroyContext() { @@ -257,7 +257,7 @@ void QuartzSalBitmap::DestroyContext() } } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::CreateContext() { @@ -344,7 +344,7 @@ bool QuartzSalBitmap::CreateContext() return mxGraphicContext != NULL; } -// ------------------------------------------------------------------ + bool QuartzSalBitmap::AllocateUserData() { @@ -382,7 +382,7 @@ bool QuartzSalBitmap::AllocateUserData() return maUserBuffer.get() != 0; } -// ------------------------------------------------------------------ + class ImplPixelFormat { @@ -658,21 +658,21 @@ void QuartzSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight, } } -// ------------------------------------------------------------------ + Size QuartzSalBitmap::GetSize() const { return Size( mnWidth, mnHeight ); } -// ------------------------------------------------------------------ + sal_uInt16 QuartzSalBitmap::GetBitCount() const { return mnBits; } -// ------------------------------------------------------------------ + static struct pal_entry { @@ -801,7 +801,7 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } -// ------------------------------------------------------------------ + void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { @@ -816,7 +816,7 @@ void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) delete pBuffer; } -// ------------------------------------------------------------------ + CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int nNewHeight ) const { @@ -846,7 +846,7 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i return xCroppedImage; } -// ------------------------------------------------------------------ + static void CFRTLFree(void* /*info*/, const void* data, size_t /*size*/) { @@ -896,7 +896,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask, return xMaskedImage; } -// ------------------------------------------------------------------ + /** creates an image from the given rectangle, replacing all black pixels with nMaskColor and make all other full transparent */ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 91ff6cb1bc9e..d82621576e34 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -73,7 +73,7 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) mpCharMap->AddReference(); } -// ----------------------------------------------------------------------- + CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId ) : PhysicalFontFace( rDFA, 0 ) @@ -86,7 +86,7 @@ CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPt { } -// ----------------------------------------------------------------------- + CoreTextFontData::~CoreTextFontData() { @@ -94,14 +94,14 @@ CoreTextFontData::~CoreTextFontData() mpCharMap->DeReference(); } -// ----------------------------------------------------------------------- + sal_IntPtr CoreTextFontData::GetFontId() const { return (sal_IntPtr)mnFontId; } -// ----------------------------------------------------------------------- + static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} @@ -188,7 +188,7 @@ bool CoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapab return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } -// ----------------------------------------------------------------------- + void CoreTextFontData::ReadOs2Table( void ) const { @@ -240,7 +240,7 @@ void CoreTextFontData::ReadMacCmapEncoding( void ) const return; } -// ----------------------------------------------------------------------- + AquaSalGraphics::AquaSalGraphics() #ifdef MACOSX @@ -319,14 +319,14 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) mpTextStyle->SetTextColor( maTextColor ); } -// ----------------------------------------------------------------------- + void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( *pMetric ); } -// ----------------------------------------------------------------------- + static bool AddTempDevFont(const OUString& rFontFileURL) { @@ -410,7 +410,7 @@ void AquaSalGraphics::ClearDevFontCache() pSalData->mpFontList = NULL; } -// ----------------------------------------------------------------------- + bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, const OUString& rFontFileURL, const OUString& /*rFontName*/ ) @@ -418,7 +418,7 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, return ::AddTempDevFont(rFontFileURL); } -// ----------------------------------------------------------------------- + bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { @@ -426,7 +426,7 @@ bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPol return bRC; } -// ----------------------------------------------------------------------- + bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { @@ -434,13 +434,13 @@ bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect return bRC; } -// ----------------------------------------------------------------------- + void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) { } -// ----------------------------------------------------------------------- + sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbackLevel*/ ) { @@ -476,7 +476,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac return 0; } -// ----------------------------------------------------------------------- + SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFallbackLevel*/ ) { @@ -484,7 +484,7 @@ SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFal return pSalLayout; } -// ----------------------------------------------------------------------- + const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const { @@ -502,7 +502,7 @@ bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi return mpFontData->GetImplFontCapabilities(rFontCapabilities); } -// ----------------------------------------------------------------------- + // fake a SFNT font directory entry for a font table // see http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html#Directory @@ -686,7 +686,7 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, return true; } -// ----------------------------------------------------------------------- + void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical, Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc ) @@ -757,7 +757,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV } } -// ----------------------------------------------------------------------- + const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ ) @@ -765,7 +765,7 @@ const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( return NULL; } -// ----------------------------------------------------------------------- + const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* /*pUnicodes*/, @@ -776,7 +776,7 @@ const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, return NULL; } -// ----------------------------------------------------------------------- + void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { @@ -786,7 +786,7 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } -// ----------------------------------------------------------------------- + SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { @@ -899,5 +899,5 @@ CGContextRef SvpSalGraphics::GetContext() } #endif - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 06a3cfe487b9..2c0226a8334b 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1676,7 +1676,7 @@ void AquaSalGraphics::updateResolution() #endif -// ----------------------------------------------------------- + XorEmulation::XorEmulation() : m_xTargetLayer( NULL ) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 295719e959ec..50792ed81cbc 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -33,7 +33,7 @@ #include "osx/salframe.h" #include "osx/saldata.hxx" -// ---------------------------------------------------------------------- + void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame ) { @@ -117,7 +117,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex SetState(); } -// ---------------------------------------------------------------------- + void AquaSalGraphics::InvalidateContext() { @@ -125,7 +125,7 @@ void AquaSalGraphics::InvalidateContext() mrContext = 0; } -// ---------------------------------------------------------------------- + void AquaSalGraphics::UnsetState() { @@ -162,7 +162,7 @@ void AquaSalGraphics::SetState() CGContextSetBlendMode( mrContext, kCGBlendModeDifference ); } -// ---------------------------------------------------------------------- + bool AquaSalGraphics::CheckContext() { @@ -264,7 +264,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtA return CGpoints; } -// ----------------------------------------------------------------------- + void AquaSalGraphics::UpdateWindow( NSRect& ) { @@ -293,6 +293,6 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) DBG_ASSERT( mpFrame->mbInitShow, "UpdateWindow called on uneligible graphics" ); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 0c61499728dc..5c163ce381a7 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -33,7 +33,7 @@ #endif #include "quartz/salgdi.h" -// ----------------------------------------------------------------------- + SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) @@ -51,7 +51,7 @@ SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, #endif } -// ----------------------------------------------------------------------- + void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) { @@ -113,7 +113,7 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, } } -// ----------------------------------------------------------------------- + AquaSalVirtualDevice::~AquaSalVirtualDevice() { @@ -126,7 +126,7 @@ AquaSalVirtualDevice::~AquaSalVirtualDevice() Destroy(); } -// ----------------------------------------------------------------------- + void AquaSalVirtualDevice::Destroy() { @@ -153,7 +153,7 @@ void AquaSalVirtualDevice::Destroy() } } -// ----------------------------------------------------------------------- + SalGraphics* AquaSalVirtualDevice::GetGraphics() { @@ -164,14 +164,14 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics() return mpGraphics; } -// ----------------------------------------------------------------------- + void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } -// ----------------------------------------------------------------------- + bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { @@ -278,7 +278,7 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) #endif } -// ----------------------------------------------------------------------- + void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight ) { |