vcl/headless/svpgdi.cxx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
New commits: commit 772c3a202481506b92c496948cfdc0f23ab94b2c Author: tsahi glik <tsahi.g...@cloudon.com> Date: Fri Feb 14 14:25:24 2014 -0800 fix duplicated symbols on ios salgraphics diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 9e243a2..a1122e5 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -61,6 +61,7 @@ rDevice } // =========================================================================== +#ifndef IOS bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ ) { @@ -68,6 +69,7 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSou return false; } + bool SvpSalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, @@ -80,11 +82,13 @@ bool SvpSalGraphics::drawTransformedBitmap( return false; } + bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ ) { // TODO(P3) implement alpha blending return false; } +#endif #ifndef IOS @@ -381,6 +385,8 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor ) } } + +#ifndef IOS void SvpSalGraphics::drawPixel( long nX, long nY ) { if( m_bUseLineColor ) @@ -553,6 +559,8 @@ bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*f return false; } +#endif + void SvpSalGraphics::copyArea( long nDestX, long nDestY, long nSrcX, @@ -592,6 +600,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rPosAry, dbgOut( m_aDevice ); } +#ifndef IOS void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) { @@ -666,6 +675,8 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rPosAry, dbgOut( m_aDevice ); } +#endif + SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) { basebmp::BitmapDeviceSharedPtr aCopy = @@ -741,6 +752,13 @@ void SvpSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContext mbForeignContext = xContext != NULL; }; +void SvpSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeight) +{ + if (m_aDevice && m_aDevice->getDamageTracker() != NULL) + m_aDevice->getDamageTracker()->damaged(basegfx::B2IBox( basegfx::fround(lX), basegfx::fround(lY), basegfx::fround(lX + lWidth), basegfx::fround(lY + lHeight))); +} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits