diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:51:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:56:16 -0600 |
commit | d9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch) | |
tree | 19b6ed4d3b1dd538bb46205880505e59f8bb8002 /vcl/quartz | |
parent | fdo#72563 : PAGEREF field tag not preserved during Roundtrip (diff) | |
download | core-d9f0af83b7f0abe7119eefca62cbbca7eff818ef.tar.gz core-d9f0af83b7f0abe7119eefca62cbbca7eff818ef.zip |
Remove visual noise from vcl
Conflicts:
vcl/source/app/settings.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/toolbox2.cxx
Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341
Reviewed-on: https://gerrit.libreoffice.org/8339
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 | 10 | ||||
-rw-r--r-- | vcl/quartz/ctlayout.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salbmp.cxx | 6 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salvd.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 72bc087ca368..c9a2116c298b 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -36,7 +36,7 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -// ======================================================================= + inline double toRadian(int nDegree) { @@ -232,7 +232,7 @@ void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) CFRelease( pCGColor); } -// ======================================================================= + PhysicalFontFace* CoreTextFontData::Clone( void ) const { @@ -288,7 +288,7 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu return (int)nByteLength; } -// ======================================================================= + ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) { @@ -423,7 +423,7 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext ) } } -// ======================================================================= + SystemFontList::SystemFontList() : mpCTFontCollection( NULL ) @@ -492,7 +492,7 @@ bool SystemFontList::Init( void ) return true; } -// ======================================================================= + SystemFontList* GetCoretextFontList( void ) { diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index 02583a16553a..9dfa7f60b01f 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -167,7 +167,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // drawing position relative to the right margin on our own to avoid the // rounding errors. That is basically a hack, and it should go away if one day // we managed to get rid of those rounding errors. -// + // We continue using GetDrawPosition() for non-right aligned text, to minimize // any unforeseen side effects. CGPoint CTLayout::GetTextDrawPosition(void) const diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index a30a22b1c4d1..50a75135c082 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -46,14 +46,14 @@ 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 ) @@ -949,7 +949,7 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHe return xMask; } -// ======================================================================= + /** QuartzSalBitmap::GetSystemData Get platform native image data from existing image * diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 41e1b492baa6..c44eda16a720 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -59,7 +59,7 @@ using namespace vcl; -// ======================================================================= + CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) : PhysicalFontFace( rSrc ) diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 5c163ce381a7..0320070d045b 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -58,7 +58,7 @@ void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) delete pDevice; } -// ======================================================================= + AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) : mbGraphicsUsed( false ) |