INTEGRATION: CWS canvas23101_SRC680 (1.5.20); FILE MERGED

2007/09/13 12:19:11 pl 1.5.20.1: #i81235# #i81236# #i81237# cairo patches (thanks radekdoulik), cleaned up some warnings

2 files changed, 12 insertions, 11 deletions

diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index b85d3b5c3a14..d9697c061245 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cairo_spritecanvas.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2007-11-09 10:14:15 $
+ *  last change: $Author: rt $ $Date: 2007-11-09 11:32:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,16 +93,17 @@ namespace cairocanvas
         sal_Bool bIsFullscreen( sal_False );
         aArguments[3] >>= bIsFullscreen;
 
-        // TODO(Q2): This now works for Solaris, but still warns for gcc
-        Window* pOutputWindow = (Window*) *reinterpret_cast<const sal_Int64*>(aArguments[0].getValue());
+        sal_Int64 nWindowPtr = 0;
+    aArguments[0] >>= nWindowPtr;
+    Window* pOutputWindow = reinterpret_cast<Window*>(nWindowPtr);
+
+        CHECK_AND_THROW( pOutputWindow != NULL,
+                         "SpriteCanvas::SpriteCanvas: invalid Window pointer" );
 
         Size aPixelSize( pOutputWindow->GetOutputSizePixel() );
         const ::basegfx::B2ISize aSize( aPixelSize.Width(),
                                         aPixelSize.Height() );
 
-        CHECK_AND_THROW( pOutputWindow != NULL,
-                         "SpriteCanvas::initialize: invalid Window pointer" );
-
         // setup helper
         maDeviceHelper.init( *pOutputWindow,
                              *this,
diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index 551eb34b71b4..9f93aa72af84 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cairo_spritehelper.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2007-07-17 14:21:52 $
+ *  last change: $Author: rt $ $Date: 2007-11-09 11:32:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -122,7 +122,7 @@ namespace cairocanvas
     const ::basegfx::B2DHomMatrix aTransform( getTransformation() );
 
     if( isActive() && !::basegfx::fTools::equalZero( fAlpha ) ) {
-        OSL_TRACE ("CanvasCustomSprite::redraw called\n");
+        OSL_TRACE ("CanvasCustomSprite::redraw called");
         if( pCairo ) {
         basegfx::B2DVector aSize = getSizePixel();
         cairo_save( pCairo );
@@ -165,7 +165,7 @@ namespace cairocanvas
             doPolyPolygonImplementation( aClipPoly, Clip, pCairo );
         }
 
-        OSL_TRACE ("aSize %f x %f\n", aSize.getX(), aSize.getY() );
+        OSL_TRACE ("aSize %f x %f position: %f,%f", aSize.getX(), aSize.getY(), fX, fY );
         cairo_rectangle( pCairo, 0, 0, floor( aSize.getX() ), floor( aSize.getY() ) );
         cairo_clip( pCairo );
         cairo_set_matrix( pCairo, &aOrigMatrix );