diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-11-25 13:24:09 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-11-25 13:31:32 +0200 |
commit | a0d112a53023758a28d180ffd12766b4d325bf52 (patch) | |
tree | 16255fc9bbc6bfd2c29354bb3c7aa2f5b23edd98 | |
parent | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (diff) |
tdf#95783: Don't calculate width of text with glyph fallback as way too wide
The old code in MultiSalLayout::GetTextBreak() only makes sense if the
base level character width is zero where a fallback level has a
non-zero character width, and vice versa. But this is not the case for
Windows, at least not any more now when using UniscribeLayout and not
SimpleWinLayout.
This simple change fixes that: Only use the width from a fallback
level if the width at the base level is zero. Hopefully it does not
cause regressions for other documents or on other platforms. (But, I
repeat, I find it hard to believe that the intent of the code could
really have been to ever add two or more non-zero widths for the same
character from different levels of fallback and use that.)
Change-Id: Ic66c55db4b7463f9e04fcedec76f1c44f5e62e03
-rw-r--r-- | vcl/source/gdi/sallayout.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index e17184ce5871..50bef0594c0e 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -1865,9 +1865,12 @@ sal_Int32 MultiSalLayout::GetTextBreak( DeviceCoordinate nMaxWidth, DeviceCoordi fUnitMul /= rLayout.GetUnitsPerPixel(); for( int i = 0; i < nCharCount; ++i ) { - DeviceCoordinate w = pCharWidths[ i + nCharCount ]; - w = (DeviceCoordinate)(w * fUnitMul + 0.5); - pCharWidths[ i ] += w; + if( pCharWidths[ i ] == 0 ) + { + DeviceCoordinate w = pCharWidths[ i + nCharCount ]; + w = (DeviceCoordinate)(w * fUnitMul + 0.5); + pCharWidths[ i ] = w; + } } } |