sc/source/ui/app/inputhdl.cxx | 13 +++++-------- sfx2/source/sidebar/SidebarController.cxx | 6 ++++++ 2 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit 1d77ea8f3e64af4becff869474dd79c633dd0070 Author: Jan Holesovsky <ke...@collabora.com> AuthorDate: Thu Nov 15 11:51:42 2018 +0100 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jul 25 13:45:10 2019 +0200 lok sc: Fix the formula input bar and address bar notifications. Apparently we did not have the pInputWin living in the background; but now we have. There is no reason to treat it in an 'else' branch, these checks should be separate either way. Change-Id: Ibb8d92fb1e2803942460d2063847917d082fcb2e Reviewed-on: https://gerrit.libreoffice.org/71863 Reviewed-by: Aron Budea <aron.bu...@collabora.com> Tested-by: Aron Budea <aron.bu...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/76292 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index e9c1270272c2..e1ce5592db68 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3688,11 +3688,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if ( pInputWin ) pInputWin->SetTextString(aString); - else if (comphelper::LibreOfficeKit::isActive()) - { - if (pActiveViewSh) - pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr()); - } + + if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh) + pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr()); } if ( pInputWin || comphelper::LibreOfficeKit::isActive()) // Named range input @@ -3730,10 +3728,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed); pInputWin->SetSumAssignMode(); } - else if (pActiveViewSh) - { + + if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh) pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr()); - } } if (bStopEditing) commit bf7adf4c24209b48198d06a66e7fadba66637763 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Sun Sep 2 11:38:31 2018 -0400 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jul 25 13:45:00 2019 +0200 sidebar: support closing the sidebar through the X button Change-Id: I078c27d22bbee3d02ad4a3fb97ba01a394f171e1 Reviewed-on: https://gerrit.libreoffice.org/73503 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index e636f4cb30df..8f09d3f38af6 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -48,6 +48,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/namedvaluecollection.hxx> +#include <comphelper/lok.hxx> #include <sal/log.hxx> #include <officecfg/Office/UI/Sidebar.hxx> @@ -1094,6 +1095,11 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) void SidebarController::RequestCloseDeck() { + if (comphelper::LibreOfficeKit::isActive()) + { + mpCurrentDeck->GetLOKNotifier()->notifyWindow(mpCurrentDeck->GetLOKWindowId(), "close"); + } + mbIsDeckRequestedOpen = false; UpdateDeckOpenState(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits