diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-12-17 05:18:35 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-12-18 01:54:16 +0000 |
| commit | 4c539fac018dfd44cd8db52161a8cb930c627da7 (patch) | |
| tree | d7530d03926971e58584b64ce618984eb47baf74 /canvas | |
| parent | 8272ffb8ed00f211a8fbda71136d695b42249b70 (diff) | |
vcl get rid of xub_StrLen and STRING_LEN in outdev3
a new log section (sal.rtl.xub) is used to display alert in case of
suspicious len == 0xFFFF (aka STRING_LEN)
Change-Id: I3ed2aa7896e12592be9e003580dd6c8eda4add5e
Reviewed-on: https://gerrit.libreoffice.org/7117
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 8 | ||||
| -rw-r--r-- | canvas/source/vcl/textlayout.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 3d4bd55162ed..6ee3dabd4263 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -787,8 +787,8 @@ namespace oglcanvas aVDev.GetTextOutlines(rAct.maPolyPolys, rTxt.Text, 0, - (xub_StrLen)rTxt.StartPosition, - (xub_StrLen)rTxt.Length, + rTxt.StartPosition, + rTxt.Length, true, 0, pDXArray.get() ); @@ -799,8 +799,8 @@ namespace oglcanvas aVDev.GetTextOutlines(rAct.maPolyPolys, rTxt.Text, 0, - (xub_StrLen)rTxt.StartPosition, - (xub_StrLen)rTxt.Length ); + rTxt.StartPosition, + rTxt.Length ); } // own copy, for thread safety diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index d8a0b14fbed5..29134850e9fc 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -128,9 +128,9 @@ namespace vclcanvas if (aVDev.GetTextOutlines( aOutlines, maText.Text, - ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), - ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), - ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length), + maText.StartPosition, + maText.StartPosition, + maText.Length, sal_False, 0, aOffsets.get())) |