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

[Michael Meeks (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d6bb6ed7e5d20305662d75feccbbefaafb09c6df
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Oct 8 14:01:11 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Oct 8 16:50:46 2019 +0200

    lok: only generate sidebar JSON for mobile views, for now.
    
    Change-Id: I7a4b20cfc93ddd77752790a7c303f512a62afbb3
    Reviewed-on: https://gerrit.libreoffice.org/80459
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 62eaf1ecf026..b38525bf7e4d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -187,7 +187,10 @@ void Deck::Resize()
 {
     Window::Resize();
 
-    if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+    const vcl::ILibreOfficeKitNotifier *pNotifier;
+    if (comphelper::LibreOfficeKit::isActive() &&
+        comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) &&
+        (pNotifier = GetLOKNotifier()))
     {
         try
         {