diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 13:06:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 13:06:27 +0000 |
| commit | 88907415f03b4566d0ed87e98e372dd5c3c74e50 (patch) | |
| tree | 54c14a4c2143e9446388b3871546bc48cd870792 | |
| parent | 21229eeab92f5d84ae2d5fd7b7a83abc67ab1b4a (diff) | |
Resolves: fdo#46923 fdo#46750 revert thai glyph fallback
Revert "fdo#33090 better glyph fallback under windows for complex text"
This reverts commit e601c32661735e9fd78def7ee11bfe21279cca71.
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 7b08ee819a40..c1911497a500 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -1855,28 +1855,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, const VisualItem& rVI = mpVisualItems[ nItem ]; if( rVI.IsEmpty() ) continue; - - //Resolves: fdo#33090 Ensure that all glyph slots, even if 0-width - //or empty due to combining chars etc, map back to a character - //position so that iterating over glyph slots one at a time for - //glyph fallback can keep context as to what characters are the - //inputs that caused a missing glyph in a given font. - { - int dir = 1; - int out = rVI.mnMinCharPos; - if (rVI.IsRTL()) - { - dir = -1; - out = rVI.mnEndCharPos-1; - } - for(c = rVI.mnMinCharPos; c < rVI.mnEndCharPos; ++c) - { - int i = out; - mpGlyphs2Chars[i] = c; - out += dir; - } - } - // calculate the mapping by using mpLogClusters[] // mpGlyphs2Chars[] should obey the logical order // => reversing the loop does this by overwriting higher logicals |