include/vcl/outdev.hxx | 1 - sc/source/ui/view/output2.cxx | 2 +- vcl/source/app/svapp.cxx | 2 +- vcl/source/outdev/bitmap.cxx | 22 ---------------------- vcl/source/window/window.cxx | 2 +- 5 files changed, 3 insertions(+), 26 deletions(-)
New commits: commit cc6cce6b1be75cd160fc858051e305961fe697dd Author: Jan Holesovsky <[email protected]> Date: Thu Nov 20 11:52:37 2014 +0100 One more IsMapMode() -> IsMapModeEnabled(). Change-Id: Id8e5ca61eedb7607b5ef9d7e67bee47c87d4990b diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index f81eb3d..fc3535e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -795,7 +795,7 @@ bool ScDrawStringsVars::HasEditCharacters() const double ScOutputData::GetStretch() { - if ( mpRefDevice->IsMapMode() ) + if ( mpRefDevice->IsMapModeEnabled() ) { // If a non-trivial MapMode is set, its scale is now already // taken into account in the OutputDevice's font handling commit 3a6f1c6c65bc78f1d13a924b028f7ed38fc717c4 Author: Jan Holesovsky <[email protected]> Date: Thu Nov 20 11:04:24 2014 +0100 vcl: If there it a MapMode, it is applied. Based on that, I believe this condition can go too. Change-Id: I88d8211678ca148bdf85729f57893e1476a52fc9 diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index fe2b835..93c37c4 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -522,17 +522,6 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize SalBitmap* pSalAlphaBmp = pMaskBmp->ImplGetSalBitmap(); bool bTryDirectPaint(pSalSrcBmp && pSalAlphaBmp); - if (bTryDirectPaint) - { - // only paint direct when no MapMode, else the - // more expensive conversions may be done for short-time Bitmap/BitmapEx - // used for buffering only - if (IsMapModeEnabled()) - { - bTryDirectPaint = false; - } - } - if (bTryDirectPaint && mpGraphics->DrawAlphaBitmap(aPosAry, *pSalSrcBmp, *pSalAlphaBmp, this)) { // tried to paint as alpha directly. If tis worked, we are done (except @@ -661,17 +650,6 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r // separate alpha VDev bool bTryDirectPaint(!mpAlphaVDev && !pDisableNative && !bHMirr && !bVMirr); - if (bTryDirectPaint) - { - // only paint direct when no MapMode, else the - // more expensive conversions may be done for short-time Bitmap/BitmapEx - // used for buffering only - if (IsMapModeEnabled()) - { - bTryDirectPaint = false; - } - } - if(bTryDirectPaint) { Point aRelPt = aOutPt + Point( mnOutOffX, mnOutOffY ); commit f622648b23ddab9387dd72116d2105fe2e59ff76 Author: Jan Holesovsky <[email protected]> Date: Thu Nov 20 10:14:23 2014 +0100 vcl: Kill IsMapMode(), it means the same as IsMapModeEnabled(). Change-Id: I65fd40b8268cb0a27ba40da60fcf8e84cc8f7661 diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d80d394..dfe88aa 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1556,7 +1556,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 c9dd3c7..8d99977 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 4b0583b..fe2b835 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 5789a89..cabf455 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
