diff options
Diffstat (limited to 'vcl/aqua/source/gdi/salgdi.cxx')
| -rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 73 |
1 files changed, 38 insertions, 35 deletions
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index c64601ba48a3..9e658b24021e 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -29,21 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salconst.h" -#include "salgdi.h" -#include "salbmp.h" -#include "salframe.h" -#include "salcolorutils.hxx" -#include "sft.hxx" -#include "salatsuifontutils.hxx" - -#include "vcl/impfont.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" -#include "vcl/region.h" - #include "osl/file.hxx" #include "osl/process.h" @@ -56,7 +41,24 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "vcl/sysdata.hxx" +#include "vcl/svapp.hxx" + +#include "aqua/salconst.h" +#include "aqua/salgdi.h" +#include "aqua/salbmp.h" +#include "aqua/salframe.h" +#include "aqua/salcolorutils.hxx" +#include "aqua/salatsuifontutils.hxx" + +#include "fontsubset.hxx" +#include "impfont.hxx" +#include "region.h" +#include "sallayout.hxx" +#include "sft.hxx" + using namespace vcl; @@ -392,7 +394,7 @@ void AquaSalGraphics::updateResolution() initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil ); } -void AquaSalGraphics::initResolution( NSWindow* pWin ) +void AquaSalGraphics::initResolution( NSWindow* ) { // #i100617# read DPI only once; there is some kind of weird caching going on // if the main screen changes @@ -1093,22 +1095,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, - const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*, + const SalPoint* const*, const sal_uInt8* const* ) { return sal_False; } @@ -1194,7 +1196,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap // ----------------------------------------------------------------------- -void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags ) +void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ) { ApplyXorContext(); @@ -1259,7 +1261,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS // ----------------------------------------------------------------------- -void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor ) +void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor ) { OSL_FAIL("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); @@ -1361,7 +1363,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY ) // ----------------------------------------------------------------------- -static void DrawPattern50( void* info, CGContextRef rContext ) +static void DrawPattern50( void*, CGContextRef rContext ) { static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } }; CGContextAddRects( rContext, aRects, 2 ); @@ -1628,7 +1630,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL // ----------------------------------------------------------------------- -sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) +sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) { return 0; } @@ -1725,8 +1727,8 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // ----------------------------------------------------------------------- -bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const String& rFontFileURL, const String& rFontName ) +bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, + const String& rFontFileURL, const String& /*rFontName*/ ) { ::rtl::OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); @@ -1884,7 +1886,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) // ----------------------------------------------------------------------- -sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel ) +sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int /*nFallbackLevel*/ ) { if( !pReqFont ) { @@ -2419,28 +2421,29 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti // ----------------------------------------------------------------------- const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( - const ImplFontData* pFontData, const Ucs2OStrMap** ppNonEncoded ) + const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } // ----------------------------------------------------------------------- -const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData, - const sal_Ucs* pUnicodes, - sal_Int32* pWidths, - FontSubsetInfo& rInfo, - long* pDataLen ) +const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*, + const sal_Ucs* /*pUnicodes*/, + sal_Int32* /*pWidths*/, + FontSubsetInfo&, + long* /*pDataLen*/ ) { return NULL; } // ----------------------------------------------------------------------- -void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen ) +void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of // AquaSalGraphics::GetEmbedFontData() returns non-NULL + (void)pData; DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } |