diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /canvas/source/vcl/textlayout.cxx | |
parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) |
rebase to DEV300_m100
Diffstat (limited to 'canvas/source/vcl/textlayout.cxx')
-rw-r--r-- | canvas/source/vcl/textlayout.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
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; |