From 143f5e31f0b7588d2c9cc314699d2a3d3ae5959a Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 13:00:11 +0100
Subject: removetooltypes01: #i112600# adjust canvas

---
 canvas/source/vcl/textlayout.cxx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'canvas/source/vcl/textlayout.cxx')

diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index a2fd331fa66f..19b0f7cea4ce 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -58,7 +58,7 @@ namespace vclcanvas
                               sal_Int8      nTextDirection )
         {
             // TODO(P3): avoid if already correctly set
-            ULONG nLayoutMode;
+            sal_uIntPtr nLayoutMode;
             switch( nTextDirection )
             {
                 default:
@@ -139,10 +139,10 @@ namespace vclcanvas
         if (aVDev.GetTextOutlines(
             aOutlines,
             maText.Text,
-            ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-            ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-            ::canvas::tools::numeric_cast<USHORT>(maText.Length),
-            FALSE,
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length),
+            sal_False,
             0,
             aOffsets.get()))
         {
@@ -192,9 +192,9 @@ namespace vclcanvas
         if (aVDev.GetGlyphBoundRects(
             Point(0,0),
             maText.Text,
-            ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-            ::canvas::tools::numeric_cast<USHORT>(maText.Length),
-            ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length),
+            ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
             aMetricVector))
         {
             aBoundingBoxes.realloc(aMetricVector.size());
@@ -272,8 +272,8 @@ namespace vclcanvas
             return geometry::RealRectangle2D( 0, nAboveBaseline,
                                               aVDev.GetTextWidth(
                                                   maText.Text,
-                                                  ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-                                                  ::canvas::tools::numeric_cast<USHORT>(maText.Length) ),
+                                                  ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+                                                  ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ),
                                               nBelowBaseline );
         }
     }
@@ -405,15 +405,15 @@ namespace vclcanvas
             rOutDev.DrawTextArray( rOutpos,
                                    maText.Text,
                                    aOffsets.get(),
-                                   ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-                                   ::canvas::tools::numeric_cast<USHORT>(maText.Length) );
+                                   ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+                                   ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
         }
         else
         {
             rOutDev.DrawText( rOutpos,
                               maText.Text,
-                              ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
-                              ::canvas::tools::numeric_cast<USHORT>(maText.Length) );
+                              ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+                              ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
         }
 
         return true;
-- 
cgit