diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:11:12 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:11:12 +0000 |
commit | c9706acf976e5834955619b5048368ee1a724e90 (patch) | |
tree | d2c5b8ffc7c2491a42df950e5c066e6c68b8b6c4 /canvas | |
parent | 449a02c52fb4e7e58b2984b475015a1fddaa0365 (diff) |
INTEGRATION: CWS presfixes03 (1.2.2); FILE MERGED
2005/04/01 15:48:08 thb 1.2.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/source/vcl/canvashelper_texturefill.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 72400aebccc8..959392af1ac9 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -2,9 +2,9 @@ * * $RCSfile: canvashelper_texturefill.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-03-30 07:37:12 $ + * last change: $Author: obo $ $Date: 2005-04-18 09:11:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -282,11 +282,8 @@ namespace vclcanvas { // setup alpha modulation values rendering::RenderState aLocalState( renderState ); - aLocalState.DeviceColor.realloc( 4 ); - aLocalState.DeviceColor[0] = 0.0; - aLocalState.DeviceColor[1] = 0.0; - aLocalState.DeviceColor[2] = 0.0; - aLocalState.DeviceColor[3] = textures[0].Alpha; + ::canvas::tools::setDeviceColor( aLocalState, + 0.0, 0.0, 0.0, textures[0].Alpha ); return drawBitmapModulated( rCanvas, textures[0].Bitmap, |