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/quartz | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/quartz')
-rw-r--r-- | vcl/quartz/ctfonts.cxx | 36 | ||||
-rw-r--r-- | vcl/quartz/salbmp.cxx | 43 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 43 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 4 | ||||
-rw-r--r-- | vcl/quartz/salgdiutils.cxx | 7 | ||||
-rw-r--r-- | vcl/quartz/salvd.cxx | 12 |
6 files changed, 0 insertions, 145 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index ce44ca8e1e8e..029caed18702 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -37,8 +37,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" - - inline double toRadian(int nDegree) { return nDegree * (M_PI / 1800.0); @@ -111,16 +109,12 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) #endif } - - CoreTextStyle::~CoreTextStyle( void ) { if( mpStyleDict ) CFRelease( mpStyleDict ); } - - void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const { // get the matching CoreText font handle @@ -141,8 +135,6 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const rMetric.mbKernableFont = true; } - - bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) const { CGGlyph nCGGlyph = aGlyphId & GF_IDXMASK; @@ -159,8 +151,6 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - // callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline() struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; }; @@ -221,8 +211,6 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg return true; } - - void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) { CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() }; @@ -233,29 +221,21 @@ void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) CFRelease( pCGColor); } - - 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 { DBG_ASSERT( pTagName[4]=='\0', "CoreTextFontData::GetFontTable with invalid tagname!\n" ); @@ -289,8 +269,6 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu return (int)nByteLength; } - - ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) { // all CoreText fonts are device fonts that can rotate just fine @@ -424,15 +402,11 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext ) } } - - SystemFontList::SystemFontList() : mpCTFontCollection( NULL ) , mpCTFontArray( NULL ) {} - - SystemFontList::~SystemFontList() { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -446,16 +420,12 @@ SystemFontList::~SystemFontList() CFRelease( mpCTFontCollection ); } - - void SystemFontList::AddFont( CoreTextFontData* pFontData ) { sal_IntPtr nFontId = pFontData->GetFontId(); maFontContainer[ nFontId ] = pFontData; } - - void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) const { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -463,8 +433,6 @@ void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) co rFontCollection.Add( (*it).second->Clone() ); } - - CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const { CTFontContainer::const_iterator it = maFontContainer.find( nFontId ); @@ -473,8 +441,6 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const return (*it).second; } - - bool SystemFontList::Init( void ) { // enumerate available system fonts @@ -493,8 +459,6 @@ bool SystemFontList::Init( void ) return true; } - - SystemFontList* GetCoretextFontList( void ) { SystemFontList* pList = new SystemFontList(); diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index e0a57d3caf59..5ecc507a6780 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -47,15 +46,11 @@ static const unsigned long k32BitRedColorMask = 0x00ff0000; static const unsigned long k32BitGreenColorMask = 0x0000ff00; static const unsigned long k32BitBlueColorMask = 0x000000ff; - - static bool isValidBitCount( sal_uInt16 nBitCount ) { return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32); } - - QuartzSalBitmap::QuartzSalBitmap() : mxGraphicContext( NULL ) , mxCachedImage( NULL ) @@ -66,15 +61,11 @@ QuartzSalBitmap::QuartzSalBitmap() { } - - QuartzSalBitmap::~QuartzSalBitmap() { Destroy(); } - - bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, int nX, int nY, int nWidth, int nHeight ) { @@ -123,22 +114,16 @@ 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 ) { const QuartzSalBitmap& rSourceBitmap = static_cast<const QuartzSalBitmap&>(rSalBmp); @@ -159,23 +144,17 @@ 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() { DestroyContext(); maUserBuffer.reset(); } - - void QuartzSalBitmap::DestroyContext() { if( mxCachedImage ) @@ -194,8 +173,6 @@ void QuartzSalBitmap::DestroyContext() } } - - bool QuartzSalBitmap::CreateContext() { DestroyContext(); @@ -259,8 +236,6 @@ bool QuartzSalBitmap::CreateContext() return mxGraphicContext != NULL; } - - bool QuartzSalBitmap::AllocateUserData() { Destroy(); @@ -297,8 +272,6 @@ bool QuartzSalBitmap::AllocateUserData() return maUserBuffer.get() != 0; } - - class ImplPixelFormat { protected: @@ -573,22 +546,16 @@ 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 { sal_uInt8 mnRed; @@ -716,8 +683,6 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } - - void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { // invalidate graphic context if we have different data @@ -731,8 +696,6 @@ void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) delete pBuffer; } - - CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int nNewHeight ) const { if( !mxCachedImage ) @@ -763,8 +726,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i return xCroppedImage; } - - static void CFRTLFree(void* /*info*/, const void* data, size_t /*size*/) { rtl_freeMemory( const_cast<void*>(data) ); @@ -821,8 +782,6 @@ 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 { @@ -875,8 +834,6 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHe return xMask; } - - /** QuartzSalBitmap::GetSystemData Get platform native image data from existing image * * @param rData struct BitmapSystemData, defined in vcl/inc/bitmap.hxx diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 1ab0931afb3d..4a346df57e04 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -57,11 +57,8 @@ #include "sallayout.hxx" #include "sft.hxx" - using namespace vcl; - - CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) : PhysicalFontFace( rSrc ) , mnFontId( rSrc.mnFontId ) @@ -74,8 +71,6 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) mpCharMap->AddReference(); } - - CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId ) : PhysicalFontFace( rDFA, 0 ) , mnFontId( nFontId ) @@ -87,23 +82,17 @@ CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPt { } - - CoreTextFontData::~CoreTextFontData() { if( mpCharMap ) mpCharMap->DeReference(); } - - sal_IntPtr CoreTextFontData::GetFontId() const { return (sal_IntPtr)mnFontId; } - - static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} const ImplFontCharMap* CoreTextFontData::GetImplFontCharMap() const @@ -189,8 +178,6 @@ bool CoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapab return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } - - void CoreTextFontData::ReadOs2Table( void ) const { // read this only once per font @@ -337,15 +324,11 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) mpTextStyle->SetTextColor( maTextColor ); } - - void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( *pMetric ); } - - static bool AddTempDevFont(const OUString& rFontFileURL) { OUString aUSytemPath; @@ -444,38 +427,28 @@ void AquaSalGraphics::ClearDevFontCache() pSalData->mpFontList = NULL; } - - bool AquaSalGraphics::AddTempDevFont( PhysicalFontCollection*, const OUString& rFontFileURL, const OUString& /*rFontName*/ ) { return ::AddTempDevFont(rFontFileURL); } - - bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { const bool bRC = mpTextStyle->GetGlyphOutline( aGlyphId, rPolyPoly ); return bRC; } - - bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const bool bRC = mpTextStyle->GetGlyphBoundRect( aGlyphId, rRect ); return bRC; } - - void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) { } - - sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbackLevel*/ ) { // release the text style @@ -510,16 +483,12 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac return 0; } - - SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFallbackLevel*/ ) { SalLayout* pSalLayout = mpTextStyle->GetTextLayout(); return pSalLayout; } - - const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const { if( !mpFontData ) @@ -536,8 +505,6 @@ 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 static void FakeDirEntry( const char aTag[5], ByteCount nOfs, ByteCount nLen, @@ -720,8 +687,6 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, return true; } - - void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical, Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc ) { @@ -791,16 +756,12 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV } } - - const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } - - const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* /*pUnicodes*/, sal_Int32* /*pWidths*/, @@ -810,8 +771,6 @@ const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, return NULL; } - - void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of @@ -820,8 +779,6 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } - - SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { SystemFontData aSysFontData; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index de28d5a67994..71346758cad4 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -619,7 +619,6 @@ bool AquaSalGraphics::drawTransformedBitmap( return true; } - bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) { @@ -1585,7 +1584,6 @@ void AquaSalGraphics::Pattern50Fill() CGContextFillPath( mrContext ); } - void AquaSalGraphics::ResetClipRegion() { // release old path and indicate no clipping @@ -1810,8 +1808,6 @@ void AquaSalGraphics::updateResolution() #endif - - XorEmulation::XorEmulation() : m_xTargetLayer( NULL ) , m_xTargetContext( NULL ) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 229c3437d80c..cd2341386655 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -33,8 +32,6 @@ #include "osx/salframe.h" #include "osx/saldata.hxx" - - void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame ) { mpFrame = pFrame; @@ -76,8 +73,6 @@ void AquaSalGraphics::InvalidateContext() mrContext = 0; } - - void AquaSalGraphics::UnsetState() { if( mrContext ) @@ -205,6 +200,4 @@ 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 543fc5d60289..5894ce11374f 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -101,8 +101,6 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, } } - - AquaSalVirtualDevice::~AquaSalVirtualDevice() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::~AquaSalVirtualDevice() this=" << this ); @@ -115,8 +113,6 @@ AquaSalVirtualDevice::~AquaSalVirtualDevice() Destroy(); } - - void AquaSalVirtualDevice::Destroy() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::Destroy() this=" << this << " mbForeignContext=" << mbForeignContext ); @@ -146,8 +142,6 @@ void AquaSalVirtualDevice::Destroy() } } - - SalGraphics* AquaSalVirtualDevice::AcquireGraphics() { if( mbGraphicsUsed || !mpGraphics ) @@ -157,15 +151,11 @@ SalGraphics* AquaSalVirtualDevice::AcquireGraphics() return mpGraphics; } - - void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } - - bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::SetSize() this=" << this << " (" << nDX << "x" << nDY << ")" << " mbForeignContext=" << mbForeignContext ); @@ -280,8 +270,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) return (mxLayer != NULL); } - - void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight ) { if( mxLayer ) |