[Libreoffice-commits] core.git: 2 commits - include/svx libreofficekit/qa sd/source svx/source

[Miklos Vajna]

 include/svx/svdpagv.hxx                             |    2 +-
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |    4 +---
 sd/source/ui/view/drviews1.cxx                      |    3 ++-
 svx/source/svdraw/svdpagv.cxx                       |    5 +++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ca3436723455a0d0f3ced6f33b646b7c79ab05a1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 12 14:25:18 2015 +0200

    sd tiled rendering: make invalidation in DrawViewShell::SwitchPage() optional
    
    In case of tiled rendering clients already get LOK_CALLBACK_SET_PART
    when switching slides, so it's pointless to additionally invalidate
    windows for help lines.
    
    Change-Id: Ibc15c9862ae85bd72328161fa5f7e72d82fd2a97

diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 48c5b5b..04b18f9 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -221,7 +221,7 @@ public:
     const SetOfByte& GetLockedLayers() const { return aLayerLock; }
 
     const SdrHelpLineList& GetHelpLines() const { return aHelpLines; }
-    void SetHelpLines(const SdrHelpLineList& rHLL);
+    void SetHelpLines(const SdrHelpLineList& rHLL, bool bInvalidate = true);
     //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos);
     void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
     void DeleteHelpLine(sal_uInt16 nNum);
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index cf146ae..0ff2d8b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -992,7 +992,8 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
                 }
                 else
                 {
-                    pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines() );
+                    bool bInvalidate = !comphelper::LibreOfficeKit::isActive();
+                    pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines(), bInvalidate );
                 }
             }
 
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0037771..bb7c921 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -741,10 +741,11 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
     }
 }
 
-void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL)
+void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL, bool bInvalidate)
 {
     aHelpLines=rHLL;
-    InvalidateAllWin();
+    if (bInvalidate)
+        InvalidateAllWin();
 }
 
 void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
commit 27fa10fa53c7ff28c2636b6b49118c87c822f2fd
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 12 12:41:49 2015 +0200

    gtktiledviewer: drop tiles on set-part event
    
    When changePart() is called, we have two type of actions:
    
    - the ones we want to execute only in case the part was changed by the
      user (and not programatically -- e.g. because the request came from
      the widget)
    - the ones we want to execute all the time
    
    Resetting the view (so the tile buffer drops all the tiles) is something
    we want to do all the time, that's one of the needed things when the
    set-part event is emitted.
    
    Change-Id: Ic6bfbe460dc5a3fd8834f3b1ef93436fc9d3ad84

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b1a0934..497f3b9 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -536,10 +536,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
     TiledWindow& rWindow = lcl_getTiledWindow(pSelector);
 
     if (rWindow.m_bPartSelectorBroadcast && rWindow.m_pDocView)
-    {
         lok_doc_view_set_part( LOK_DOC_VIEW(rWindow.m_pDocView), nPart );
-        lok_doc_view_reset_view( LOK_DOC_VIEW(rWindow.m_pDocView) );
-    }
+    lok_doc_view_reset_view(LOK_DOC_VIEW(rWindow.m_pDocView));
 }
 
 static void removeChildrenFromStatusbar(GtkWidget* children, gpointer pData)