diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 13:44:52 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 13:44:52 +0000 |
commit | bd88379c5632916f29b511804386cca9afe6d878 (patch) | |
tree | 1c841360eefc5a4027311776fd1363274e18e83c /vcl | |
parent | 10923684020aac50628152b5dc61892d56200c80 (diff) |
INTEGRATION: CWS ooo20031216 (1.32.2); FILE MERGED
2004/01/26 17:29:19 mh 1.32.2.2: RESYNC: (1.32-1.33); FILE MERGED
2003/12/13 13:26:04 waratah 1.32.2.1: #i22301# fix for scoping problems
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/source/gdi/xfont.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx index 51e977b5fc55..e9bca54e22b6 100644 --- a/vcl/unx/source/gdi/xfont.cxx +++ b/vcl/unx/source/gdi/xfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xfont.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: vg $ $Date: 2004-01-06 14:40:45 $ + * last change: $Author: hr $ $Date: 2004-02-04 14:44:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -679,7 +679,9 @@ bool X11FontLayout::LayoutText( ImplLayoutArgs& rArgs ) { Point aNewPos( 0, 0 ); bool bRightToLeft; - for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); ) + int nCharPos; + + for( nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); ) { sal_Unicode cChar = rArgs.mpStr[ nCharPos ]; if( bRightToLeft ) |