Kaydet (Commit) d8584f62 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

fdo#82550 LogicWidthToDeviceCoordinate missed handling of mbMap == false

Change-Id: I98902ed266ae7b2737fa9720d69a4b87cc958d51
üst 32a92502
...@@ -2144,11 +2144,12 @@ long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) ...@@ -2144,11 +2144,12 @@ long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit )
DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const
{ {
if ( !mbMap )
return (DeviceCoordinate)nWidth;
#if VCL_FLOAT_DEVICE_PIXEL #if VCL_FLOAT_DEVICE_PIXEL
return (double)nWidth * maMapRes.mfScaleX * mnDPIX; return (double)nWidth * maMapRes.mfScaleX * mnDPIX;
#else #else
if ( !mbMap )
return nWidth;
return ImplLogicToPixel( nWidth, mnDPIX, return ImplLogicToPixel( nWidth, mnDPIX,
maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX, maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX,
...@@ -2158,11 +2159,11 @@ DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const ...@@ -2158,11 +2159,11 @@ DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const
DeviceCoordinate OutputDevice::LogicHeightToDeviceCoordinate( long nHeight ) const DeviceCoordinate OutputDevice::LogicHeightToDeviceCoordinate( long nHeight ) const
{ {
if ( !mbMap )
return (DeviceCoordinate)nHeight;
#if VCL_FLOAT_DEVICE_PIXEL #if VCL_FLOAT_DEVICE_PIXEL
return (double)nHeight * maMapRes.mfScaleY * mnDPIY; return (double)nHeight * maMapRes.mfScaleY * mnDPIY;
#else #else
if ( !mbMap )
return nHeight;
return ImplLogicToPixel( nHeight, mnDPIY, return ImplLogicToPixel( nHeight, mnDPIY,
maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY, maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment