[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 553ce975b5de6a883757d815913ca5c8ad2d1afa
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Tue Oct 29 20:05:54 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Oct 31 11:55:59 2019 +0100

    Revert "lok: only generate sidebar JSON for mobile views, for now."
    
    Tunnelling Deck causes major problems, SidebarDockingWindow
    is tunnelled instead.
    
    This reverts commit d6bb6ed7e5d20305662d75feccbbefaafb09c6df.
    
    Change-Id: Ib1ec53fed0d948d4119fc81db09ea18a9d3be76b
    Reviewed-on: https://gerrit.libreoffice.org/81752
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 5fe1c6093eb3..99b3728d0838 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -182,10 +182,7 @@ void Deck::Resize()
 {
     Window::Resize();
 
-    const vcl::ILibreOfficeKitNotifier *pNotifier;
-    if (comphelper::LibreOfficeKit::isActive() &&
-        comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) &&
-        (pNotifier = GetLOKNotifier()))
+    if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
     {
         try
         {
commit 6a077e809b4578312e7a66ba18c99828afe9a772
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Tue Oct 29 20:03:32 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Oct 31 11:55:47 2019 +0100

    Revert "jsdialogs: set LOKNotifier in Deck"
    
    Tunnelling Deck causes major problems, SidebarDockingWindow
    is tunnelled instead.
    
    This reverts commit b728dda0c99679c4ab0d6a1180aab5aee1d63cf0.
    
    Change-Id: If0ce69a885665686d5c197757422d0e4a8bbf5c2
    Reviewed-on: https://gerrit.libreoffice.org/81751
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index b38525bf7e4d..5fe1c6093eb3 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -68,11 +68,6 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
 
     mpVerticalScrollBar->SetScrollHdl(LINK(this, Deck, HandleVerticalScrollBarChange));
 
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        SetLOKNotifier(SfxViewShell::Current());
-    }
-
 #ifdef DEBUG
     SetText(OUString("Deck"));
     mpScrollClipWindow->SetText(OUString("ScrollClipWindow"));