diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:53:13 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 19:02:03 -0600 |
| commit | a918e60386f3e2d36012c1cb2842e561455ecf3f (patch) | |
| tree | 5ea2bc6533aa18dfa753c58bc0a5fee120eb450d /canvas | |
| parent | e7bbed8e319ced003e9a29e9388ae91e9987e293 (diff) | |
mis-merge: clean-up remaining tools types
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 8a2ec0b4bd57..add009fca6c8 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -214,8 +214,8 @@ namespace cairocanvas 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 ); } } @@ -404,8 +404,8 @@ namespace cairocanvas } aSysLayoutData = rOutDev.GetSysTextLayoutData(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), maLogicalAdvancements.getLength() ? aOffsets.get() : NULL); // Sort them so that all glyphs on the same glyph fallback level are consecutive @@ -446,15 +446,15 @@ namespace cairocanvas if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances { 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) ); return true; } else // VCL FALLBACK - without advances { 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; } } |