summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 10:50:40 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 10:50:40 +0000
commit6cd6053560334c730aa85bfa480f45609f43bc53 (patch)
treedb7898b25b3f9c49a703446d24efd65499357794 /cppcanvas/source/wrapper
parentddb12feee4bd490c0019e3c4fd2ca076cf3f0ec9 (diff)
INTEGRATION: CWS canvas05 (1.9.38); FILE MERGED
2008/04/21 07:50:45 thb 1.9.38.2: RESYNC: (1.9-1.10); FILE MERGED 2007/10/01 13:41:45 thb 1.9.38.1: #i79258# Merge from CWS picom
Diffstat (limited to 'cppcanvas/source/wrapper')
-rw-r--r--cppcanvas/source/wrapper/implbitmap.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 84e49d636de9..080bc215063a 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: implbitmap.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -31,10 +31,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppcanvas.hxx"
-#include <implbitmap.hxx>
-#include <implbitmapcanvas.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
+#include "implbitmap.hxx"
+#include "implbitmapcanvas.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include <canvas/canvastools.hxx>
@@ -103,8 +103,10 @@ namespace cppcanvas
}
rendering::RenderState aLocalState( getRenderState() );
- ::canvas::tools::setDeviceColor( aLocalState,
- 1.0, 1.0, 1.0, nAlphaModulation );
+ uno::Sequence<rendering::ARGBColor> aCol(1);
+ aCol[0] = rendering::ARGBColor( nAlphaModulation, 1.0, 1.0, 1.0 );
+ aLocalState.DeviceColor =
+ pCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(aCol);
// TODO(P1): implement caching
pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap,