diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
| tree | 7d938fd9373eb827095787955e2feffca942b8fd /drawinglayer | |
| parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) | |
fix mis-merge all-around.
Diffstat (limited to 'drawinglayer')
| -rwxr-xr-x | drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 3968caa287c0..5c5dc918b2a8 100755 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -272,7 +272,7 @@ namespace drawinglayer nChars = nWidthToFill / nWidth; String aFilled; - aFilled.Fill( (USHORT)nChars, aText.GetChar( 0 ) ); + aFilled.Fill( (sal_uInt16)nChars, aText.GetChar( 0 ) ); aText = aFilled; nPos = 0; nLen = nChars; |