From 8f905b7a860411f8d2b681e65a7773b990226162 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 24 Jun 2008 09:38:33 +0000
Subject: INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED 2008/06/03 23:52:24
 thb 1.2.2.4: Removed extra level of indirection for getting a graphics for a
 surface; removed some unused code 2008/04/21 07:30:54 thb 1.2.2.3: RESYNC:
 (1.2-1.3); FILE MERGED 2008/01/22 00:25:24 thb 1.2.2.2: #i81092# Making
 gdiplus and dx canvas more independent 2007/12/20 22:18:57 thb 1.2.2.1:
 #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework,
 completing various areas such as color spaces, bitmap data access, true
 sprite and non-sprite implementations, and upstreaming the canvas parts of
 rodos emf+ rendering

---
 canvas/source/directx/dx_spritehelper.cxx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index 2efc29ad2860..f68c703b9e12 100755
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dx_spritehelper.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,9 +28,13 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_canvas.hxx"
+
 #include <ctype.h> // don't ask. msdev breaks otherwise...
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <rtl/logfile.hxx>
 #include <rtl/math.hxx>
@@ -50,7 +54,6 @@
 #include "dx_canvascustomsprite.hxx"
 #include "dx_spritehelper.hxx"
 #include "dx_impltools.hxx"
-#include "dx_surfacegraphics.hxx"
 
 #include <memory>
 
@@ -66,13 +69,13 @@ namespace dxcanvas
     {
     }
 
-    void SpriteHelper::init( const geometry::RealSize2D&        rSpriteSize,
-                             const SpriteCanvasRef&             rSpriteCanvas,
-                             const IDXRenderModuleSharedPtr&    rRenderModule,
-                             const DXBitmapSharedPtr            rBitmap,
-                             bool                               bShowSpriteBounds )
+    void SpriteHelper::init( const geometry::RealSize2D&     rSpriteSize,
+                             const SpriteCanvasRef&          rSpriteCanvas,
+                             const IDXRenderModuleSharedPtr& rRenderModule,
+                             const DXSurfaceBitmapSharedPtr  rBitmap,
+                             bool                            bShowSpriteBounds )
     {
-        ENSURE_AND_THROW( rSpriteCanvas.get() &&
+        ENSURE_OR_THROW( rSpriteCanvas.get() &&
                           rRenderModule &&
                           rBitmap,
                           "SpriteHelper::init(): Invalid device, sprite canvas or surface" );
-- 
cgit v1.2.3