diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-06-18 14:06:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-06-18 14:06:52 +0000 |
| commit | b77d1aee1be92b124a9b6ec80b37424c3cdf8b83 (patch) | |
| tree | 05c72cf5169d83d5fb64c83cf25dbc3de2ddbba1 /vcl/win | |
| parent | 3561d5405cceb40e4b87fe97679654eebae917da (diff) | |
INTEGRATION: CWS forscope (1.79.60); FILE MERGED
2004/06/18 14:12:22 obo 1.79.60.1: #i30457# forScope and RTTI
Diffstat (limited to 'vcl/win')
| -rwxr-xr-x | vcl/win/source/gdi/winlayout.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 4f1f40b12ffc..d04beb386970 100755 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winlayout.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: rt $ $Date: 2004-03-30 13:45:22 $ + * last change: $Author: hr $ $Date: 2004-06-18 15:06:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -289,7 +289,8 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) { // count chars to process as LTR rArgs.ResetPos(); - for( bool bRTL; rArgs.GetNextRun( &i, &j, &bRTL ) && !bRTL; ) + bool bRTL; + for( bRTL; rArgs.GetNextRun( &i, &j, &bRTL ) && !bRTL; ) mnGlyphCount += j - i; // if there are RTL runs we need room to remember the RTL status if( bRTL ) @@ -1882,7 +1883,8 @@ void UniscribeLayout::MoveGlyph( int nStart, long nNewXPos ) long nDelta = nNewXPos - pVI->mnXOffset; if( nStart > nMinGlyphPos ) { - for( int i = nMinGlyphPos; i < nStart; ++i ) + int i; + for( i = nMinGlyphPos; i < nStart; ++i ) nDelta -= mpGlyphAdvances[ i ]; mpGlyphAdvances[ i-1 ] += nDelta; } @@ -2185,7 +2187,8 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) bool bModified = false; int nOldWidth = 0; DBG_ASSERT( mnUnitsPerPixel==1, "UniscribeLayout.mnUnitsPerPixel != 1" ); - for( int i = mnMinCharPos, j = 0; i < mnEndCharPos; ++i, ++j ) + int i,j; + for( i = mnMinCharPos, j = 0; i < mnEndCharPos; ++i, ++j ) { int nNewCharWidth = (pDXArray[j] - nOldWidth); // TODO: nNewCharWidth *= mnUnitsPerPixel; |