diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:07:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:07:23 +0000 |
| commit | 9329074b6321fb2ff820d484f4e0f60bbd1aae2e (patch) | |
| tree | 1a422b4ecf43449b3ce9e2fffe56c3c80c2e2378 /canvas | |
| parent | 8ff7bbb1189f59932c8c2568043c9a2ed711d1f2 (diff) | |
INTEGRATION: CWS presfixes03 (1.7.2); FILE MERGED
2005/04/01 15:48:05 thb 1.7.2.1: #i36190#, #i37793#, #i39245#, #i46023# Fixes for open/close polygon stroking; beefed up the canvas tools; moved try/catch block around configuration in cf_factory (to facilitate canvasdemo with broken/incomplete services.rdb; enhanced TextLayout to cope with new Action::getBounds() functionality in cppcanvas (needed for proper mtf bounds calculation); removed extra pixel right and bottom for filled polygons; avoiding uno::Sequence::operator[] for non-const cases, but using the naked mem ptr instead (performance)
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/inc/canvas/canvastools.hxx | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 2eb16540a606..29c2e9c317ee 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: canvastools.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-03-30 07:34:18 $ + * last change: $Author: obo $ $Date: 2005-04-18 09:07:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,39 +170,39 @@ namespace canvas initViewState( ::com::sun::star::rendering::ViewState& viewState ); ::basegfx::B2DHomMatrix& - getViewStateTransform( ::basegfx::B2DHomMatrix& transform, + getViewStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState ); ::com::sun::star::rendering::ViewState& setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::basegfx::B2DHomMatrix& - getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, + getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::RenderState& renderState ); ::com::sun::star::rendering::RenderState& setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::com::sun::star::rendering::ViewState& appendToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::com::sun::star::rendering::RenderState& appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::com::sun::star::rendering::ViewState& prependToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::com::sun::star::rendering::RenderState& prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); + const ::basegfx::B2DHomMatrix& transform ); ::basegfx::B2DHomMatrix& - mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, + mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); @@ -213,11 +213,23 @@ namespace canvas const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > xCanvas ); - bool operator==( const ::com::sun::star::rendering::RenderState& rLHS, - const ::com::sun::star::rendering::RenderState& rRHS ); + void setDeviceColor( ::com::sun::star::rendering::RenderState& o_renderState, + const double& rColor0, + const double& rColor1, + const double& rColor2, + const double& rColor3 ); - bool operator==( const ::com::sun::star::rendering::ViewState& rLHS, - const ::com::sun::star::rendering::ViewState& rRHS ); + void getDeviceColor( double& o_rColor0, + double& o_rColor1, + double& o_rColor2, + double& o_rColor3, + const ::com::sun::star::rendering::RenderState& rRenderState ); + + bool operator==( const ::com::sun::star::rendering::RenderState& rLHS, + const ::com::sun::star::rendering::RenderState& rRHS ); + + bool operator==( const ::com::sun::star::rendering::ViewState& rLHS, + const ::com::sun::star::rendering::ViewState& rRHS ); // Matrix utilities |