diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-08-14 22:43:26 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-08-14 22:43:26 +0200 |
| commit | 47f3485579929724afc0c4c5ebdfd2143cf952be (patch) | |
| tree | 824878e35f4d375a99fcdcd90664ded8e841b83c | |
| parent | d8584f62e28369594c5d1b733e5804837a98dd85 (diff) | |
Revert "Resolves: fdo#82550 MacOSX GetTextBreak always return -1"
This reverts commit 4c1e2c446865b355f50720b8b96ec704822006dc.
it was just hiding the underlying bug.
| -rw-r--r-- | vcl/source/outdev/text.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f60062b6ea85..75ac162ff040 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1428,12 +1428,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, long nWidthFactor = pSalLayout->GetUnitsPerPixel(); long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1; nTextWidth *= nWidthFactor * nSubPixelFactor; - long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth ); - long nExtraPixelWidth = 0; + DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( nTextWidth ); + DeviceCoordinate nExtraPixelWidth = 0; if( nCharExtra != 0 ) { nCharExtra *= nWidthFactor * nSubPixelFactor; - nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra ); + nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra ); } nRetVal = pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor ); @@ -1462,12 +1462,12 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, long nSubPixelFactor = (nWidthFactor < 64 ) ? 64 : 1; nTextWidth *= nWidthFactor * nSubPixelFactor; - long nTextPixelWidth = ImplLogicWidthToDevicePixel( nTextWidth ); - long nExtraPixelWidth = 0; + DeviceCoordinate nTextPixelWidth = LogicWidthToDeviceCoordinate( nTextWidth ); + DeviceCoordinate nExtraPixelWidth = 0; if( nCharExtra != 0 ) { nCharExtra *= nWidthFactor * nSubPixelFactor; - nExtraPixelWidth = ImplLogicWidthToDevicePixel( nCharExtra ); + nExtraPixelWidth = LogicWidthToDeviceCoordinate( nCharExtra ); } // calculate un-hyphenated break position |