diff options
Diffstat (limited to 'canvas/source/vcl/canvashelper.cxx')
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 7a1578bef92b..9f1808c858e7 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -154,35 +154,35 @@ namespace vclcanvas void CanvasHelper::clear() { // are we disposed? - if( mpOutDevProvider ) - { - OutputDevice& rOutDev( mpOutDevProvider->getOutDev() ); - tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); + if( !mpOutDevProvider ) + return; - rOutDev.EnableMapMode( false ); - rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); - rOutDev.SetLineColor( COL_WHITE ); - rOutDev.SetFillColor( COL_WHITE ); - rOutDev.SetClipRegion(); - rOutDev.DrawRect( ::tools::Rectangle( Point(), - rOutDev.GetOutputSizePixel()) ); + OutputDevice& rOutDev( mpOutDevProvider->getOutDev() ); + tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); - if( mp2ndOutDevProvider ) - { - OutputDevice& rOutDev2( mp2ndOutDevProvider->getOutDev() ); - - rOutDev2.SetDrawMode( DrawModeFlags::Default ); - rOutDev2.EnableMapMode( false ); - rOutDev2.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); - rOutDev2.SetLineColor( COL_WHITE ); - rOutDev2.SetFillColor( COL_WHITE ); - rOutDev2.SetClipRegion(); - rOutDev2.DrawRect( ::tools::Rectangle( Point(), - rOutDev2.GetOutputSizePixel()) ); - rOutDev2.SetDrawMode( DrawModeFlags::BlackLine | DrawModeFlags::BlackFill | DrawModeFlags::BlackText | - DrawModeFlags::BlackGradient | DrawModeFlags::BlackBitmap ); - } - } + rOutDev.EnableMapMode( false ); + rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); + rOutDev.SetLineColor( COL_WHITE ); + rOutDev.SetFillColor( COL_WHITE ); + rOutDev.SetClipRegion(); + rOutDev.DrawRect( ::tools::Rectangle( Point(), + rOutDev.GetOutputSizePixel()) ); + + if( !mp2ndOutDevProvider ) + return; + + OutputDevice& rOutDev2( mp2ndOutDevProvider->getOutDev() ); + + rOutDev2.SetDrawMode( DrawModeFlags::Default ); + rOutDev2.EnableMapMode( false ); + rOutDev2.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); + rOutDev2.SetLineColor( COL_WHITE ); + rOutDev2.SetFillColor( COL_WHITE ); + rOutDev2.SetClipRegion(); + rOutDev2.DrawRect( ::tools::Rectangle( Point(), + rOutDev2.GetOutputSizePixel()) ); + rOutDev2.SetDrawMode( DrawModeFlags::BlackLine | DrawModeFlags::BlackFill | DrawModeFlags::BlackText | + DrawModeFlags::BlackGradient | DrawModeFlags::BlackBitmap ); } void CanvasHelper::drawLine( const rendering::XCanvas* , @@ -192,22 +192,22 @@ namespace vclcanvas const rendering::RenderState& renderState ) { // are we disposed? - if( mpOutDevProvider ) - { - // nope, render - tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); - setupOutDevState( viewState, renderState, LINE_COLOR ); + if( !mpOutDevProvider ) + return; - const Point aStartPoint( tools::mapRealPoint2D( aStartRealPoint2D, - viewState, renderState ) ); - const Point aEndPoint( tools::mapRealPoint2D( aEndRealPoint2D, - viewState, renderState ) ); - // TODO(F2): alpha - mpOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint ); + // nope, render + tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); + setupOutDevState( viewState, renderState, LINE_COLOR ); - if( mp2ndOutDevProvider ) - mp2ndOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint ); - } + const Point aStartPoint( tools::mapRealPoint2D( aStartRealPoint2D, + viewState, renderState ) ); + const Point aEndPoint( tools::mapRealPoint2D( aEndRealPoint2D, + viewState, renderState ) ); + // TODO(F2): alpha + mpOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint ); + + if( mp2ndOutDevProvider ) + mp2ndOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint ); } void CanvasHelper::drawBezier( const rendering::XCanvas* , @@ -216,38 +216,38 @@ namespace vclcanvas const rendering::ViewState& viewState, const rendering::RenderState& renderState ) { - if( mpOutDevProvider ) - { - tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); - setupOutDevState( viewState, renderState, LINE_COLOR ); - - const Point& rStartPoint( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.Px, - aBezierSegment.Py), - viewState, renderState ) ); - const Point& rCtrlPoint1( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C1x, - aBezierSegment.C1y), - viewState, renderState ) ); - const Point& rCtrlPoint2( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C2x, - aBezierSegment.C2y), - viewState, renderState ) ); - const Point& rEndPoint( tools::mapRealPoint2D( _aEndPoint, - viewState, renderState ) ); - - ::tools::Polygon aPoly(4); - aPoly.SetPoint( rStartPoint, 0 ); - aPoly.SetFlags( 0, PolyFlags::Normal ); - aPoly.SetPoint( rCtrlPoint1, 1 ); - aPoly.SetFlags( 1, PolyFlags::Control ); - aPoly.SetPoint( rCtrlPoint2, 2 ); - aPoly.SetFlags( 2, PolyFlags::Control ); - aPoly.SetPoint( rEndPoint, 3 ); - aPoly.SetFlags( 3, PolyFlags::Normal ); + if( !mpOutDevProvider ) + return; - // TODO(F2): alpha - mpOutDevProvider->getOutDev().DrawPolygon( aPoly ); - if( mp2ndOutDevProvider ) - mp2ndOutDevProvider->getOutDev().DrawPolygon( aPoly ); - } + tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider ); + setupOutDevState( viewState, renderState, LINE_COLOR ); + + const Point& rStartPoint( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.Px, + aBezierSegment.Py), + viewState, renderState ) ); + const Point& rCtrlPoint1( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C1x, + aBezierSegment.C1y), + viewState, renderState ) ); + const Point& rCtrlPoint2( tools::mapRealPoint2D( geometry::RealPoint2D(aBezierSegment.C2x, + aBezierSegment.C2y), + viewState, renderState ) ); + const Point& rEndPoint( tools::mapRealPoint2D( _aEndPoint, + viewState, renderState ) ); + + ::tools::Polygon aPoly(4); + aPoly.SetPoint( rStartPoint, 0 ); + aPoly.SetFlags( 0, PolyFlags::Normal ); + aPoly.SetPoint( rCtrlPoint1, 1 ); + aPoly.SetFlags( 1, PolyFlags::Control ); + aPoly.SetPoint( rCtrlPoint2, 2 ); + aPoly.SetFlags( 2, PolyFlags::Control ); + aPoly.SetPoint( rEndPoint, 3 ); + aPoly.SetFlags( 3, PolyFlags::Normal ); + + // TODO(F2): alpha + mpOutDevProvider->getOutDev().DrawPolygon( aPoly ); + if( mp2ndOutDevProvider ) + mp2ndOutDevProvider->getOutDev().DrawPolygon( aPoly ); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* , |