diff options
Diffstat (limited to 'sfx2/source/sidebar/SidebarDockingWindow.cxx')
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index ed9340db5550..cba9e50fb2b4 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -74,28 +74,27 @@ public: pMobileNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str()); } } - else - { - // On desktop use the classic notifications. - const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(), - m_rSidebarDockingWin.GetOutOffYPixel()); - const OString posMessage = pos.toString(); - const OString sizeMessage = m_rSidebarDockingWin.GetSizePixel().toString(); - const std::string message = OString(posMessage + sizeMessage).getStr(); - const vcl::LOKWindowId lokWindowId = m_rSidebarDockingWin.GetLOKWindowId(); + // Notify the sidebar is created, and its LOKWindowId, which + // is needed on both Mobile and Desktop. + const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(), + m_rSidebarDockingWin.GetOutOffYPixel()); + const OString posMessage = pos.toString(); + const OString sizeMessage = m_rSidebarDockingWin.GetSizePixel().toString(); - if (lokWindowId != m_LastLOKWindowId || message != m_LastNotificationMessage) - { - m_LastLOKWindowId = lokWindowId; - m_LastNotificationMessage = message; + const std::string message = OString(posMessage + sizeMessage).getStr(); + const vcl::LOKWindowId lokWindowId = m_rSidebarDockingWin.GetLOKWindowId(); - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "deck"); - aItems.emplace_back("position", posMessage); - aItems.emplace_back("size", sizeMessage); - pNotifier->notifyWindow(lokWindowId, "created", aItems); - } + if (lokWindowId != m_LastLOKWindowId || message != m_LastNotificationMessage) + { + m_LastLOKWindowId = lokWindowId; + m_LastNotificationMessage = message; + + std::vector<vcl::LOKPayloadItem> aItems; + aItems.emplace_back("type", "deck"); + aItems.emplace_back("position", posMessage); + aItems.emplace_back("size", sizeMessage); + pNotifier->notifyWindow(lokWindowId, "created", aItems); } } catch (boost::property_tree::json_parser::json_parser_error& rError) |