[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit 5c870e6ec5753c86de7c27292575a5969e792a01
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: Tue Dec 1 11:03:42 2020 +0100

    jsdialog: handle close for autofilter menu
    
    Change-Id: Iea30bac99e521bc629999e7fd3cb1c13422704e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106908
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    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 452e7c1eb61a..98421847ccd6 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -395,6 +395,9 @@ void ScCheckListMenuControl::StartPopupMode(const tools::Rectangle& rRect, Float
 
 void ScCheckListMenuControl::terminateAllPopupMenus()
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        NotifyCloseLOK();
+
     EndPopupMode();
     ScCheckListMenuWindow* pParentMenu = mxFrame->GetParentMenu();
     if (pParentMenu)
@@ -1355,7 +1358,7 @@ void ScCheckListMenuControl::NotifyCloseLOK()
             {
                 std::stringstream aStream;
                 boost::property_tree::ptree aTree;
-                aTree.put("jsontype", "dockingwindow");
+                aTree.put("jsontype", "autofilter");
                 aTree.put("action", "close");
 
                 boost::property_tree::write_json(aStream, aTree);