diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-11-20 10:14:23 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-20 11:13:21 +0100 |
commit | 40581a8e105878d751d3ac02d015403f0527f3a9 (patch) | |
tree | cdc01d1fd39f2d49f1324af50517c78c707a6715 | |
parent | b7342eae42faa8110807861906288d13a2e9f762 (diff) |
vcl: Kill IsMapMode(), it means the same as IsMapModeEnabled().
Change-Id: I65fd40b8268cb0a27ba40da60fcf8e84cc8f7661
-rw-r--r-- | include/vcl/outdev.hxx | 1 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/bitmap.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8d286805c985..3b7a00dbb5e1 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1560,7 +1560,6 @@ public: virtual void SetMapMode( const MapMode& rNewMapMode ); virtual void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } - bool IsMapMode() const { return mbMap; } // #i75163# basegfx::B2DHomMatrix GetViewTransformation() const; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index c9dd3c76027d..8d99977983be 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -595,7 +595,7 @@ void Application::SetSettings( const AllSettings& rSettings ) { pVirDev->mnDPIX = pFirstFrame->mnDPIX; pVirDev->mnDPIY = pFirstFrame->mnDPIY; - if ( pVirDev->IsMapMode() ) + if (pVirDev->IsMapModeEnabled()) { MapMode aMapMode = pVirDev->GetMapMode(); pVirDev->SetMapMode(); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index f4304ac0ad32..f6f387f2a460 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -527,7 +527,7 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize // only paint direct when no MapMode, else the // more expensive conversions may be done for short-time Bitmap/BitmapEx // used for buffering only - if (IsMapMode()) + if (IsMapModeEnabled()) { bTryDirectPaint = false; } @@ -666,7 +666,7 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r // only paint direct when no MapMode, else the // more expensive conversions may be done for short-time Bitmap/BitmapEx // used for buffering only - if (IsMapMode()) + if (IsMapModeEnabled()) { bTryDirectPaint = false; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5789a89fb299..cabf455e7f06 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1447,7 +1447,7 @@ void Window::ImplInitResolutionSettings() // update the recalculated values for logical units // and also tools belonging to the values - if ( IsMapMode() ) + if (IsMapModeEnabled()) { MapMode aMapMode = GetMapMode(); SetMapMode(); |