diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:34:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:34:08 +0000 |
| commit | 194f54d46ae6709db8859ff812f031920e4faff2 (patch) | |
| tree | 88e51619bac3d9d96fbd189bf561f483a4b9fc5a | |
| parent | b95972025cd26cf9a50d15091142c5fcccbf24c7 (diff) | |
INTEGRATION: CWS aw033 (1.26.18); FILE MERGED
2008/06/26 12:22:31 aw 1.26.18.10: corrections after resync
2008/06/25 13:10:35 aw 1.26.18.9: RESYNC: (1.29-1.30); FILE MERGED
2008/05/14 15:08:30 aw 1.26.18.8: RESYNC: (1.28-1.29); FILE MERGED
2007/12/13 16:44:09 aw 1.26.18.7: #i39532# AA work for unxlngi6
2007/11/07 17:21:16 aw 1.26.18.6: #i39532# checking in to create a working version for HDU
2007/10/24 11:19:24 hdu 1.26.18.5: #i75669# allow DrawPolyLine for B2DPolygon to change the LineJoin attribute
2007/08/09 20:03:58 aw 1.26.18.4: RESYNC: (1.26-1.28); FILE MERGED
2007/05/29 14:50:31 hdu 1.26.18.3: #i75669# fix warnings after RESYNC to SRC680_m212
2007/04/16 13:53:38 hdu 1.26.18.2: #i75669# support B2D line drawing on anisometric graphics
2007/03/28 08:49:34 hdu 1.26.18.1: #i75669# add stubs for b2d-polygon mirroring
| -rw-r--r-- | vcl/source/gdi/salgdilayout.cxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index d892c9962e18..2e2d40df791e 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdilayout.cxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.31 $ * * This file is part of OpenOffice.org. * @@ -295,7 +295,14 @@ void SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, cons mirror( nX, nWidth, pOutDev ); drawRect( nX, nY, nWidth, nHeight ); } -void SalGraphics::DrawPolyLine( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) +bool SalGraphics::drawPolyLine( + const basegfx::B2DPolygon& /*rPolyPolygon*/, + const basegfx::B2DVector& /*rLineWidths*/, + basegfx::B2DLineJoin /*eLineJoin*/) +{ + return false; +} +void SalGraphics::DrawPolyLine( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) ) { @@ -347,16 +354,7 @@ bool SalGraphics::DrawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolygon DBG_ASSERT( !(m_nLayout & SAL_LAYOUT_BIDI_RTL), "DrawPolyPolygon - no mirroring implemented"); return drawPolyPolygon( rPolyPolygon, fTransparency ); } -bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double ) -{ - return false; -} -bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, const ::basegfx::B2DVector& rLineWidths, const OutputDevice* ) -{ - DBG_ASSERT( !(m_nLayout & SAL_LAYOUT_BIDI_RTL), "DrawPolyLine - no mirroring implemented"); - return drawPolyLine( rPolyLine, rLineWidths ); -} -bool SalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& ) +bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fTransparency*/) { return false; } @@ -376,6 +374,15 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* DBG_ASSERT( !(m_nLayout & SAL_LAYOUT_BIDI_RTL), "DrawPolyPolygonBezier - no mirroring implemented"); return drawPolyPolygonBezier( nPoly, pPoints, pPtAry, pFlgAry ); } + +bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& rPolygon, + const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin, + const OutputDevice* ) +{ + DBG_ASSERT( !(m_nLayout & SAL_LAYOUT_BIDI_RTL), "DrawPolygon for B2D - no mirroring implemented"); + return drawPolyLine( rPolygon, rLineWidth, eLineJoin ); +} + void SalGraphics::CopyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, |