INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED

2004/11/01 22:21:48 thb 1.2.2.4: #110496# Performance optimizations: added profiling traces
2004/07/20 19:08:58 thb 1.2.2.3: #110496# Unified include statements; removed external prefix from boost includes
2004/05/27 20:51:28 thb 1.2.2.2: #110496#
Added classification code to all TODO/HACK/FIXME comments.
There are four categories:
- code quality (C)
- performance (P)
- missing functionality (F)
- and missing/incomplete error handling (E)

Furthermore, every category has a severity number between
1 and 3 associated, where 1 is lowest and 3 highest
severity
2004/04/05 15:58:47 thb 1.2.2.1: Resync with canvas01 changes

1 files changed, 17 insertions, 8 deletions

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 18bc72f9b44a..24bdfa834c97 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bitmapaction.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:41:03 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 20:54:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,9 +59,12 @@
  *
  ************************************************************************/
 
-#include "bitmapaction.hxx"
-#include "outdevstate.hxx"
+#include <bitmapaction.hxx>
+#include <outdevstate.hxx>
 
+#ifndef _RTL_LOGFILE_HXX_
+#include <rtl/logfile.hxx>
+#endif
 #ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XBITMAP_HPP__
 #include <drafts/com/sun/star/rendering/XBitmap.hpp>
 #endif
@@ -87,7 +90,7 @@
 #include <basegfx/tools/canvastools.hxx>
 #endif
 
-#include "mtftools.hxx"
+#include <mtftools.hxx>
 
 
 using namespace ::com::sun::star;
@@ -196,7 +199,7 @@ namespace cppcanvas
         {
             tools::initRenderState(maState,rState);
 
-            // TODO: setup clipping/extract only part of the bitmap
+            // TODO(F2): setup clipping/extract only part of the bitmap
             implSetupTransform( maState, rSrcPoint, rSrcSize, rDstPoint, rDstSize );
         }
 
@@ -204,11 +207,17 @@ namespace cppcanvas
         {
         }
 
-        bool BitmapAction::render() const
+        bool BitmapAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
         {
+            RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::BitmapAction::render()" );
+            RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::BitmapAction: 0x%X", this );
+
+            rendering::RenderState aLocalState( maState );
+            ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
+
             mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
                                                   mpCanvas->getViewState(),
-                                                  maState );
+                                                  aLocalState );
 
             return true;
         }