[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source

[Ptyl Dragon]

 sw/source/core/view/viewsh.cxx |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 6c3c19b5ba971aef4d552ad2fa76e896fce3301e
Author: Ptyl Dragon <ptyl at cloudon.com>
Date:   Mon Nov 4 13:34:44 2013 +0200

    removed use of envvars in touch_lo_draw_tile
    
    Change-Id: Id9ee6e616fe417023d0ce011263659056e80a5a2

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index eef78eb..7ac4c0d 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1800,8 +1800,6 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
     Application::AcquireSolarMutex(1);
     if (pViewShell)
     {
-        static bool bUseTileSize = getenv("USETILESIZE") != NULL;
-        static bool bCallSetSwVisArea = bUseTileSize && getenv("CALLSETSWVISAREA") != NULL;
         // TODO create a VirtualDevice based on SystemGraphicsData instead so
         // that we get direct rendering; something like:
         //
@@ -1816,23 +1814,12 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
         aMapMode.SetScaleX(scaleX);
         aMapMode.SetScaleY(scaleY);
         aDevice.SetMapMode(aMapMode);
-        if (bCallSetSwVisArea)
-        {
-            SwRect foo = pViewShell->VisArea();
-            SAL_INFO("sw", "old VisArea: " << foo);
-            SetSwVisArea( pViewShell, SwRect(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight)) );
-            foo = pViewShell->VisArea();
-            SAL_INFO("sw", "new VisArea: " << foo);
-        }
         // resizes the virtual device so to contain the entrie context
         aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
         // scroll the requested area into view if necessary
         pViewShell->MakeVisible(SwRect(Point(tilePosX, tilePosY), aDevice.PixelToLogic(Size(contextWidth, contextHeight))));
         // draw - works in logic coordinates
-        if (bUseTileSize)
-            pViewShell->PaintTile(&aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight)));
-        else
-            pViewShell->PaintTile(&aDevice, Rectangle(Point(tilePosX, tilePosY), aDevice.PixelToLogic(Size(contextWidth, contextHeight))));
+        pViewShell->PaintTile(&aDevice, Rectangle(Point(tilePosX, tilePosY), aDevice.PixelToLogic(Size(contextWidth, contextHeight))));
         // copy the aDevice content to mpImage
         Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight))));
         BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess();