diff -r 9d3789dba519 canvas/source/cairo/cairo_textlayout.cxx
--- a/canvas/source/cairo/cairo_textlayout.cxx	Wed Apr 21 19:22:29 2010 +0200
+++ b/canvas/source/cairo/cairo_textlayout.cxx	Thu Apr 22 22:44:55 2010 +0200
@@ -536,26 +536,29 @@
         
         cairo_set_font_matrix(pSCairo.get(), &m);
         
-        OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s", 
-                  aFont.GetWidth(),
-                  aFont.GetHeight(),
-                  aMetric.GetWidth(),
-                  nWidth,
-                  (int) rOutpos.X(),
-                  (int) rOutpos.Y(),
-                  cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, 
-                  maLogicalAdvancements.getLength() ? "ADV " : "",
-                  aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",
-                  aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",
-                  aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",
+#if OSL_DEBUG_LEVEL > 0        
+        if( cairo_glyphs.size() > 2 )
+            OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s", 
+                      aFont.GetWidth(),
+                      aFont.GetHeight(),
+                      aMetric.GetWidth(),
+                      nWidth,
+                      (int) rOutpos.X(),
+                      (int) rOutpos.Y(),
+                      cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, 
+                      maLogicalAdvancements.getLength() ? "ADV " : "",
+                      aSysLayoutData.aSysFontData.bAntialias ? "AA " : "",
+                      aSysLayoutData.aSysFontData.bFakeBold ? "FB " : "",
+                      aSysLayoutData.aSysFontData.bFakeItalic ? "FI " : "",
 #if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
-                  ::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),
+                      ::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),
 #else
-                  ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+                      ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
 #endif
-                  ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
-                                            RTL_TEXTENCODING_UTF8 ).getStr()
-            );
+                      ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
+                                                RTL_TEXTENCODING_UTF8 ).getStr()
+                );
+#endif
         
         cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
         
diff -r 9d3789dba519 canvas/source/vcl/canvashelper_texturefill.cxx
--- a/canvas/source/vcl/canvashelper_texturefill.cxx	Wed Apr 21 19:22:29 2010 +0200
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx	Thu Apr 22 22:44:55 2010 +0200
@@ -706,7 +706,7 @@
                 ::basegfx::B2DRectangle aTextureDeviceRect;
                 ::canvas::tools::calcTransformedRectBounds( aTextureDeviceRect, 
                                                             aRect, 
-                                                            aTextureTransform );
+                                                            aTotalTransform );
                 rOutDev.SetLineColor( COL_RED ); 
                 rOutDev.SetFillColor();
                 rOutDev.DrawRect( ::vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
@@ -715,7 +715,7 @@
                 ::Polygon aPoly1( 
                     ::vcl::unotools::rectangleFromB2DRectangle( aRect ));
                 ::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() );
-                aPoly2.transform( aTextureTransform );
+                aPoly2.transform( aTotalTransform );
                 ::Polygon aPoly3( aPoly2 );
                 rOutDev.DrawPolygon( aPoly3 );
             }
diff -r 9d3789dba519 slideshow/source/engine/debug.cxx
--- a/slideshow/source/engine/debug.cxx	Wed Apr 21 19:22:29 2010 +0200
+++ b/slideshow/source/engine/debug.cxx	Thu Apr 22 22:44:55 2010 +0200
@@ -307,7 +307,7 @@
     va_start(args, sFormat);
         
     msMessage[mnBufferSize-1] = 0;
-    _vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
+    snprintf(msMessage, mnBufferSize-1, sFormat, args);
     TRACE_BEGIN("[ %s", msMessage);
     va_end(args);
 }