diff options
| author | David Tardon <dtardon@redhat.com> | 2011-11-21 13:04:59 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-11-21 13:19:33 +0100 |
| commit | 3a88a0606ba469b6f83d8ac67e14cb1b80cecfb5 (patch) | |
| tree | 94f0a06811e40223fbc69a890a68e55b283ddf73 /vcl | |
| parent | 5e04a781c5b5cb22bb35ad3031e579ea32c0cace (diff) | |
WaE: initialization order
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index ed2ffffedad5..58ec98f4bc54 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1211,8 +1211,8 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, mnFontCharSetCount( 0 ), meWinCharSet( eWinCharSet ), mnPitchAndFamily( nPitchAndFamily ), - mbAliasSymbolsLow( false ), mbAliasSymbolsHigh( false ), + mbAliasSymbolsLow( false ), mbGsubRead( false ) { SetBitmapSize( 0, nHeight ); diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index b1591f0aad9d..dbcd2ceb82ce 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -268,9 +268,9 @@ SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet, mpGlyphs2Chars( NULL ), mpGlyphRTLFlags( NULL ), mnWidth( 0 ), + mbDisableGlyphs( false ) mnNotdefWidth( -1 ), mnCharSet( nCharSet ), - mbDisableGlyphs( false ) { mbDisableGlyphs = true; } @@ -1231,21 +1231,22 @@ static bool InitUSP() UniscribeLayout::UniscribeLayout( HDC hDC, const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry ) : WinLayout( hDC, rWinFontData, rWinFontEntry ), - mnItemCount( 0 ), mpScriptItems( NULL ), mpVisualItems( NULL ), + mnItemCount( 0 ), + mnCharCapacity( 0 ), mpLogClusters( NULL ), mpCharWidths( NULL ), - mnCharCapacity( 0 ), mnSubStringMin( 0 ), - mnGlyphCapacity( 0 ), mnGlyphCount( 0 ), - mpOutGlyphs( NULL ), + mnGlyphCapacity( 0 ), mpGlyphAdvances( NULL ), mpJustifications( NULL ), + mpOutGlyphs( NULL ), mpGlyphOffsets( NULL ), mpVisualAttrs( NULL ), mpGlyphs2Chars( NULL ), + mnMinKashidaWidth( 0 ), mnMinKashidaGlyph( 0 ), mbDisableGlyphInjection( false ) {} @@ -3061,9 +3062,9 @@ int WinSalGraphics::GetMinKashidaWidth() ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD ) : ImplFontEntry( rFSD ) -, maWidthMap( 512 ) , mpKerningPairs( NULL ) , mnKerningPairs( -1 ) +, maWidthMap( 512 ) , mnMinKashidaWidth( -1 ) , mnMinKashidaGlyph( -1 ) { |