[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
Szymon Kłos (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 3 18:55:52 UTC 2019
sfx2/source/sidebar/SidebarDockingWindow.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 40c4cd06ae51f823710d0092953187c8dd42c47c
Author: Szymon KÅos <szymon.klos at collabora.com>
AuthorDate: Tue Dec 3 17:31:08 2019 +0100
Commit: Szymon KÅos <szymon.klos at collabora.com>
CommitDate: Tue Dec 3 19:54:52 2019 +0100
jsdialogs: make possible to use on multiple mobile devices
Change-Id: I1f7867dfd15e423f10622b3cec17ed8039d23c49
Reviewed-on: https://gerrit.libreoffice.org/84367
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon KÅos <szymon.klos at collabora.com>
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 8498fe295144..ed9340db5550 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -56,7 +56,8 @@ public:
void Invoke() override
{
auto pNotifier = m_rSidebarDockingWin.GetLOKNotifier();
- if (!pNotifier || !comphelper::LibreOfficeKit::isActive())
+ auto pMobileNotifier = SfxViewShell::Current();
+ if (!pNotifier || (!pMobileNotifier && !comphelper::LibreOfficeKit::isActive()))
return;
try
@@ -70,7 +71,7 @@ public:
if (message != m_LastNotificationMessage)
{
m_LastNotificationMessage = message;
- pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str());
+ pMobileNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str());
}
}
else
More information about the Libreoffice-commits
mailing list