vcl/coretext/ctfonts.cxx | 2 +- vcl/inc/coretext/salgdi2.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 32343a92ecefedd29b38bf7842672090fa0c7a88 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 3 16:52:10 2013 +0300 Fix dbgutil build Change-Id: Ife8ca88c8f558955ee006be6294bd7b233e89916 diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx index 9c58891..1b4264a 100644 --- a/vcl/coretext/ctfonts.cxx +++ b/vcl/coretext/ctfonts.cxx @@ -299,7 +299,7 @@ ImplFontEntry* CTFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD int CTFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf ) const { - DBG_ASSERT( aTagName[4]=='\0', "CTFontData::GetFontTable with invalid tagname!\n" ); + DBG_ASSERT( pTagName[4]=='\0', "CTFontData::GetFontTable with invalid tagname!\n" ); const CTFontTableTag nTagCode = (pTagName[0]<<24) + (pTagName[1]<<16) + (pTagName[2]<<8) + (pTagName[3]<<0); commit 6c2d27b0a61d8851a1df7545aa391dfb4d0d77c8 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 3 16:51:02 2013 +0300 Fix 64-bit build When compiling as 64-bit code, NSRect *is* CGRect. Change-Id: Ia14db1354251bd2a2f53fd9d02dc2816ccef2b17 diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h index 90fb594..7693737 100644 --- a/vcl/inc/coretext/salgdi2.h +++ b/vcl/inc/coretext/salgdi2.h @@ -199,7 +199,9 @@ public: bool CheckContext(); CGContextRef GetContext(); void UpdateWindow( NSRect& ); // delivered in NSView coordinates +#if !defined(__LP64__) && !defined(NS_BUILD_32_LIKE_64) void RefreshRect( const CGRect& ); +#endif void RefreshRect( const NSRect& ); void RefreshRect(float lX, float lY, float lWidth, float lHeight); @@ -217,7 +219,7 @@ public: virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); - virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry ); + virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); @@ -398,11 +400,15 @@ private: // --- some trivial inlines +#if !defined(__LP64__) && !defined(NS_BUILD_32_LIKE_64) + inline void AquaSalGraphics::RefreshRect( const CGRect& rRect ) { RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height ); } +#endif + inline void AquaSalGraphics::RefreshRect( const NSRect& rRect ) { RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
