From 9cd038e5b89c978ea24ba7efa7c3152801190455 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 12 Mar 2011 18:57:32 -0600
Subject: fix mis-merge all-around.

---
 drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drawinglayer')

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;
-- 
cgit