diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:50:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:50:03 +0000 |
| commit | e4dced3f3a83095b4912d07d6d1bc79bb755f954 (patch) | |
| tree | 3a1b4bfb092c7ce33bed1db049822e67c969e3fa /cppcanvas/source | |
| parent | 5fe6a57e6a3b5076ebaa1081f5b3e0172f356969 (diff) | |
INTEGRATION: CWS canvas05 (1.10.14); FILE MERGED
2008/04/21 07:50:17 thb 1.10.14.2: RESYNC: (1.10-1.11); FILE MERGED
2007/10/01 13:41:45 thb 1.10.14.1: #i79258# Merge from CWS picom
Diffstat (limited to 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 9043d89ad992..b17baf6526a2 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: transparencygroupaction.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -40,6 +40,7 @@ #include <rtl/logfile.hxx> #include <com/sun/star/rendering/XBitmap.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> #include <rtl/math.hxx> @@ -466,8 +467,9 @@ namespace cppcanvas #ifdef SPECIAL_DEBUG aLocalState.Clip.clear(); aLocalState.DeviceColor = - ::vcl::unotools::colorToDoubleSequence( mpCanvas->getUNOCanvas()->getDevice(), - ::Color( 0x80FF0000 ) ); + ::vcl::unotools::colorToDoubleSequence( + ::Color( 0x80FF0000 ), + mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ); if( maState.Clip.is() ) mpCanvas->getUNOCanvas()->fillPolyPolygon( maState.Clip, @@ -487,8 +489,11 @@ namespace cppcanvas else { // add alpha modulation value to DeviceColor - ::canvas::tools::setDeviceColor( aLocalState, - 1.0, 1.0, 1.0, mnAlpha ); + uno::Sequence<rendering::ARGBColor> aCols(1); + aCols[0] = rendering::ARGBColor( mnAlpha, 1.0, 1.0, 1.0); + aLocalState.DeviceColor = + mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB( + aCols); mpCanvas->getUNOCanvas()->drawBitmapModulated( mxBufferBitmap, mpCanvas->getViewState(), |