summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-12-21 11:05:12 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-12-21 11:05:12 +0000
commit013f05baf32e84c24ce9d5270db252746a322f4a (patch)
tree9f7c95d0f0ca2cfb4c72b0b28b3bfddabd690231 /vcl
parent725566f3f88e60690ba4cba1a101d5c3df8dab1f (diff)
INTEGRATION: CWS vcl70 (1.45.104); FILE MERGED
2006/12/07 11:17:50 hdu 1.45.104.1: #i45983# get rid of auto-fallback surrogate warning
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/source/gdi/xfont.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx
index d2db9ebf05ac..d1c25d0e620c 100644
--- a/vcl/unx/source/gdi/xfont.cxx
+++ b/vcl/unx/source/gdi/xfont.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xfont.cxx,v $
*
- * $Revision: 1.45 $
+ * $Revision: 1.46 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 12:40:11 $
+ * last change: $Author: ihi $ $Date: 2006-12-21 12:05:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -711,7 +711,7 @@ bool X11FontLayout::LayoutText( ImplLayoutArgs& rArgs )
for( nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); )
{
- sal_Unicode cChar = rArgs.mpStr[ nCharPos ];
+ sal_UCS4 cChar = rArgs.mpStr[ nCharPos ];
if( bRightToLeft )
cChar = GetMirroredChar( cChar );
int nGlyphIndex = cChar | GF_ISCHAR;