[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - sc/source sd/source

[Ashod Nakashian]

 sc/source/ui/view/tabcont.cxx  |    5 +++++
 sd/source/ui/view/drviews1.cxx |    5 +++++
 2 files changed, 10 insertions(+)

New commits:
commit 8949c82c78affd048ee3eee39b0fcdef32f4a7f6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon May 9 23:38:59 2016 -0400

    LOK: fire SET_PART event when Calc page is changed
    
    Change-Id: I9a2ed653bcb6afe803b781fc686c02f817d84e75
    Reviewed-on: https://gerrit.libreoffice.org/24818
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit e743e35560ff3956b6acf9c4517e9b8b1a616dc2)

diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index a2f5d10..bfb992e 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -34,6 +34,7 @@
 #include "dragdata.hxx"
 #include "markdata.hxx"
 #include <gridwin.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -406,6 +407,10 @@ void ScTabControl::SwitchToPageId(sal_uInt16 nId)
             for (sal_uInt16 i=1; i<=nCount; i++)
                 SelectPage( i, i==nId );
             Select();
+
+            // notify LibreOfficeKit about changed page
+            OString aPayload = OString::number(nId - 1);
+            pViewData->GetDocument()->GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, aPayload.getStr());
         }
     }
 }
commit d7a0bbf6b93f1e3d4e02e3a71158c32aec7a67f9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon May 9 23:23:00 2016 -0400

    LOK: fire SET_PART event when Impress page is changed
    
    Change-Id: Iebddffbdc66397b1f2937ed7320f7800c8bab4cc
    Reviewed-on: https://gerrit.libreoffice.org/26301
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 7e62c8c9989725c4cd764b9ca01ee46bee947f7b)

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 3f99ac9..9140a96 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -81,6 +81,7 @@
 
 #include <sfx2/request.hxx>
 #include <comphelper/lok.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 using namespace com::sun::star;
 
@@ -929,6 +930,10 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
         // never at a masterpage)
         GetDoc()->SetSelected(mpActualPage, true);
 
+        // notify LibreOfficeKit about changed page
+        OString aPayload = OString::number(nSelectedPage);
+        GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, aPayload.getStr());
+
         rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetDoc() ) );
         if( !xSlideshow.is() || !xSlideshow->isRunning() || ( xSlideshow->getAnimationMode() != ANIMATIONMODE_SHOW ) )
         {