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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 26 09:35:19 UTC 2020


 sc/source/ui/cctrl/checklistmenu.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 82d8d76b8a6bb0d7b6585411666f5421a99b6d34
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Nov 12 14:48:35 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 26 10:34:10 2020 +0100

    jsdialog: handle close for autofilter menu
    
    Change-Id: Iea30bac99e521bc629999e7fd3cb1c13422704e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106659
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 1c06b33c59c0..f6834aaff790 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -396,6 +396,9 @@ void ScCheckListMenuControl::StartPopupMode(const tools::Rectangle& rRect, Float
 
 void ScCheckListMenuControl::terminateAllPopupMenus()
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        NotifyCloseLOK();
+
     EndPopupMode();
     ScCheckListMenuWindow* pParentMenu = mxFrame->GetParentMenu();
     if (pParentMenu)
@@ -1383,7 +1386,7 @@ void ScCheckListMenuControl::NotifyCloseLOK()
         if (pNotifier)
         {
             tools::JsonWriter aJsonWriter;
-            aJsonWriter.put("jsontype", "dockingwindow");
+            aJsonWriter.put("jsontype", "autofilter");
             aJsonWriter.put("action", "close");
 
             const std::string message = aJsonWriter.extractAsStdString();


More information about the Libreoffice-commits mailing list