INTEGRATION: CWS mingwport09 (1.2.12); FILE MERGED

2007/12/11 12:46:17 vg 1.2.12.1: #i83133# catch-up fixes for MinGW port

5 files changed, 20 insertions, 20 deletions

diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
index 5e69799b5fb8..0c2e0bbb1771 100755
--- a/canvas/source/directx/dx_5rm.cxx
+++ b/canvas/source/directx/dx_5rm.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dx_5rm.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 17:50:53 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 16:13:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1982,7 +1982,7 @@ namespace dxcanvas
                                  Gdiplus::FontStyleRegular,
                                  Gdiplus::UnitWorld,
                                  NULL );
-            pGraphics->get()->DrawString( rStr.getStr(),
+            pGraphics->get()->DrawString( reinterpret_cast<LPCWSTR>(rStr.getStr()),
                                           rStr.getLength(),
                                           &aFont,
                                           rPos,
diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index 98340d7b8db9..8a276901cca2 100755
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dx_canvasfont.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 17:53:00 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 16:13:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -75,7 +75,7 @@ namespace dxcanvas
         std::vector< sal_Unicode > pStrBuf(nLen+1,0);
         std::copy(pStr,pStr+nLen,&pStrBuf[0]);
 
-        mpFontFamily.reset( new Gdiplus::FontFamily(&pStrBuf[0],NULL) );
+        mpFontFamily.reset( new Gdiplus::FontFamily(reinterpret_cast<LPCWSTR>(&pStrBuf[0]),NULL) );
         if( !mpFontFamily->IsAvailable() )
             mpFontFamily.reset( new Gdiplus::FontFamily(L"Arial",NULL) );
 
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 32b5515ffded..dabd7315b5e1 100755
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dx_canvashelper.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 17:53:33 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 16:13:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -535,8 +535,8 @@ namespace dxcanvas
             // TODO(F2): Proper layout (BiDi, CTL)! IMHO must use
             // DrawDriverString here, and perform layouting myself...
             ENSURE_AND_THROW(
-                Gdiplus::Ok == (*aGraphics)->DrawString( text.Text.copy( text.StartPosition,
-                                                                         text.Length ).getStr(),
+                Gdiplus::Ok == (*aGraphics)->DrawString( reinterpret_cast<LPCWSTR>(text.Text.copy( text.StartPosition,
+                                                                         text.Length ).getStr()),
                                                          text.Length,
                                                          pFont->getFont().get(),
                                                          aPoint,
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index bb9568af5b07..9060ff0aa2a7 100755
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dx_impltools.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 17:55:36 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 16:14:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -369,14 +369,14 @@ namespace dxcanvas
             ::canvas::tools::verifyRange(rColor[2],0.0,1.0);
 
             aColor =
-                (static_cast<UINT8>( ::basegfx::fround( 255*rColor[0] ) ) << 16) |
-                (static_cast<UINT8>( ::basegfx::fround( 255*rColor[1] ) ) << 8) |
-                static_cast<UINT8>( ::basegfx::fround( 255*rColor[2] ) );
+                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[0] ) ) << 16) |
+                (static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[1] ) ) << 8) |
+                static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[2] ) );
 
             if( rColor.getLength() > 3 )
             {
                 ::canvas::tools::verifyRange(rColor[3],0.0,1.0);
-                aColor |= static_cast<UINT8>( ::basegfx::fround( 255*rColor[3] ) ) << 24;
+                aColor |= static_cast<sal_uInt8>( ::basegfx::fround( 255*rColor[3] ) ) << 24;
             }
 
             return aColor;
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 564e8b1ecaf4..5276d1f2111b 100755
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dx_spritecanvas.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 17:56:53 $
+ *  last change: $Author: obo $ $Date: 2008-01-04 16:14:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,8 +66,8 @@ using namespace ::com::sun::star;
 # define CANVAS_NAME "DX9Canvas"
 #endif
 
-#define SERVICE_NAME        "com.sun.star.rendering." ## CANVAS_NAME
-#define IMPLEMENTATION_NAME "com.sun.star.comp.rendering." ## CANVAS_NAME
+#define SERVICE_NAME        "com.sun.star.rendering." CANVAS_NAME
+#define IMPLEMENTATION_NAME "com.sun.star.comp.rendering." CANVAS_NAME
 
 
 namespace dxcanvas