[Libreoffice-commits] core.git: sfx2/source

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 8 14:52:09 UTC 2019


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

New commits:
commit 2d7d3cc936cb5b0a242ad7a5c714ebde03df574d
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:40 2019 +0200

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

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 5bc09fdfc2f5..d54b4cea5c67 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -196,7 +196,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()))
     {
         std::vector<vcl::LOKPayloadItem> aItems;
         aItems.emplace_back("type", "deck");


More information about the Libreoffice-commits mailing list