summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-02 12:42:47 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-02 12:42:47 +0000
commit43a79af89b077fc7760e462b7555fe30773e13d7 (patch)
tree3aacd02d9c3dcb507698d2ad788727ecf703f316 /cppcanvas/source
parentd81cb0595f63ab988ff19e176b5b14424a486f54 (diff)
INTEGRATION: CWS canvas02 (1.6.4); FILE MERGED
2005/10/09 09:17:57 thb 1.6.4.2: RESYNC: (1.6-1.7); FILE MERGED 2005/08/19 11:08:33 thb 1.6.4.1: #i53538# Changed clip setting to use basegfx polygon (cppcanvas::PolyPolygon contains reference back to canvas); changed direct access to base class member to getter method, thus, providing the actual XCanvas clip polygon lazily.
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/wrapper/implbitmap.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 8dfdb172d456..507b8a04d1ba 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: implbitmap.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:24:56 $
+ * last change: $Author: kz $ $Date: 2005-11-02 13:42:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -88,7 +88,7 @@ namespace cppcanvas
// TODO(P1): implement caching
pCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
pCanvas->getViewState(),
- maRenderState );
+ getRenderState() );
return true;
}
@@ -107,7 +107,7 @@ namespace cppcanvas
return false;
}
- rendering::RenderState aLocalState( maRenderState );
+ rendering::RenderState aLocalState( getRenderState() );
::canvas::tools::setDeviceColor( aLocalState,
1.0, 1.0, 1.0, nAlphaModulation );