[Libreoffice-commits] core.git: include/svx svx/source

Mihai Varga mihai.varga at collabora.com
Mon Aug 3 03:12:05 PDT 2015


 include/svx/svdpagv.hxx       |    2 +-
 svx/source/svdraw/svdpagv.cxx |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a381d16d23d0efb678e9e410db3ad23313693640
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Fri Jul 31 18:24:33 2015 +0300

    Removed some whole page invalidations in impress
    
    1. For tiled rendering, don't invalidate the whole page when hiding it
    2. Don't invalidate when showing a page because we've just hidden the
    previous one
    3. No need for invalidation when setting visible layers
    
    Change-Id: I858401b22c95093c58ec00896fe92b766fddb6de
    Reviewed-on: https://gerrit.libreoffice.org/17452
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 1cc20e1..6d30747 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -215,7 +215,7 @@ public:
     void LogicToPagePos(Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); }
     void PagePosToLogic(Point& rPnt) const { rPnt+=aPgOrg; }
 
-    void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; InvalidateAllWin(); }
+    void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; }
     const SetOfByte& GetVisibleLayers() const { return aLayerVisi; }
     void SetPrintableLayers(const SetOfByte& rSet) { aLayerPrn=rSet; }
     const SetOfByte& GetPrintableLayers() const { return aLayerPrn;  }
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index e8caa44..9c74d43 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -229,7 +229,6 @@ void SdrPageView::Show()
     if(!IsVisible())
     {
         mbVisible = true;
-        InvalidateAllWin();
 
         for(sal_uInt32 a(0L); a < GetView().PaintWindowCount(); a++)
         {
@@ -242,7 +241,10 @@ void SdrPageView::Hide()
 {
     if(IsVisible())
     {
-        InvalidateAllWin();
+        if (!GetView().GetModel()->isTiledRendering())
+        {
+            InvalidateAllWin();
+        }
         mbVisible = false;
         ClearPageWindows();
     }


More information about the Libreoffice-commits mailing list