diff options
| author | Herbert Duerr [hdu] <herbert.duerr@oracle.com> | 2010-11-22 10:29:58 +0100 |
|---|---|---|
| committer | Herbert Duerr [hdu] <herbert.duerr@oracle.com> | 2010-11-22 10:29:58 +0100 |
| commit | a26b166697b3486eebe005e33184b713689c3382 (patch) | |
| tree | 96fb944e8fa47449b351c5939c3dbcc83ccde0c7 /vcl | |
| parent | a7efcc63895bb32164a9077a3e46b7cab33c3454 (diff) | |
#i108584# workaround unexpected ATSUBreakLine error result
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/aqua/source/gdi/salatslayout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 0261ab3b56fa..a355ff86d00e 100755 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -753,7 +753,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons // initial measurement of text break position UniCharArrayOffset nBreakPos = mnMinCharPos; - ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth ); + const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth ); if( nATSUMaxWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter return mnMinCharPos; // or do ATSUMaxWidth=0x10000; OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos, @@ -782,7 +782,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons if( eStatus != noErr ) return nBreakPos; const ATSUTextMeasurement nATSURemWidth = nATSUMaxWidth - (nRight - nLeft); - if( nATSURemWidth <= 0 ) + if( nATSURemWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter return nBreakPos; UniCharArrayOffset nBreakPosInWord = nBreakPos; eStatus = ATSUBreakLine( maATSULayout, nBreakPos, nATSURemWidth, false, &nBreakPosInWord ); |