[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - include/vcl vcl/source

[Jan Holesovsky]

 include/vcl/outdev.hxx       |    1 -
 vcl/source/app/svapp.cxx     |    2 +-
 vcl/source/outdev/bitmap.cxx |   22 ----------------------
 vcl/source/window/window.cxx |    2 +-
 4 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit 5ec1c4f096e65b67e7d0a322fd936b62cf7a82cc
Author: Jan Holesovsky <kendy at collabora.com>
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 f6f387f..e912086 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(!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 40581a8e105878d751d3ac02d015403f0527f3a9
Author: Jan Holesovsky <kendy at collabora.com>
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 8d28680..3b7a00d 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 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 f4304ac..f6f387f 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();