diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 11:34:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 11:34:21 +0000 |
| commit | 02b76d05229a0c99893f87e84b0f6e779d72f6bf (patch) | |
| tree | 8f7192d3e5bc1dcb0c593f89e1b5036855622b27 /vcl/unx/source/gdi/xfont.cxx | |
| parent | 27aee72a0d2c6a9359dd8ff5d347a2e89a2fb16f (diff) | |
INTEGRATION: CWS vcl09 (1.27.12); FILE MERGED
2003/05/08 14:46:12 hdu 1.27.12.1: #107765# using new ImplLayoutRuns calls
Diffstat (limited to 'vcl/unx/source/gdi/xfont.cxx')
| -rw-r--r-- | vcl/unx/source/gdi/xfont.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx index e1db84b09edd..a4a0dc258324 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.28 $ + * $Revision: 1.29 $ * - * last change: $Author: rt $ $Date: 2003-04-24 10:27:48 $ + * last change: $Author: vg $ $Date: 2003-05-28 12:34:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -644,13 +644,9 @@ X11FontLayout::X11FontLayout( ExtendedFontStruct& rFont ) bool X11FontLayout::LayoutText( ImplLayoutArgs& rArgs ) { Point aNewPos( 0, 0 ); - int nGlyphCount = 0; - for(;; ++nGlyphCount ) + bool bRightToLeft; + for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); ) { - int nCharPos; - bool bRightToLeft; - if( !rArgs.GetNextPos( &nCharPos, &bRightToLeft ) ) - break; sal_Unicode cChar = rArgs.mpStr[ nCharPos ]; if( bRightToLeft ) cChar = GetMirroredChar( cChar ); @@ -675,7 +671,7 @@ bool X11FontLayout::LayoutText( ImplLayoutArgs& rArgs ) aNewPos.X() += nGlyphWidth; } - return (nGlyphCount > 0); + return (nCharPos >= 0); } // ----------------------------------------------------------------------- |