include/vcl/salvtables.hxx | 17 +++++++++++++++++ sc/source/ui/cctrl/checklistmenu.cxx | 5 ++++- vcl/jsdialog/jsdialogbuilder.cxx | 5 +++++ vcl/source/app/salvtables.cxx | 17 ----------------- 4 files changed, 26 insertions(+), 18 deletions(-)
New commits: commit e588134d6e515511f28bf5fe4fc25cd4d5223d47 Author: Szymon Kłos <[email protected]> AuthorDate: Thu Nov 12 14:48:35 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Nov 12 14:48:35 2020 +0100 jsdialog: handle close for autofilter menu Change-Id: Iea30bac99e521bc629999e7fd3cb1c13422704e7 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); commit 738993ce0f66078a91fea25eed74b570e63b5ef8 Author: Szymon Kłos <[email protected]> AuthorDate: Thu Nov 12 14:28:47 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Nov 12 14:48:08 2020 +0100 jsdialog: signal when treeview element is toggled Change-Id: If69eac02db386fd94420aff5a8b082281e913c15 diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx index ee55bb9fa081..23db65df8525 100644 --- a/include/vcl/salvtables.hxx +++ b/include/vcl/salvtables.hxx @@ -1101,6 +1101,23 @@ public: virtual ~SalInstanceTextView() override; }; +struct SalInstanceTreeIter : public weld::TreeIter +{ + SalInstanceTreeIter(const SalInstanceTreeIter* pOrig) + : iter(pOrig ? pOrig->iter : nullptr) + { + } + SalInstanceTreeIter(SvTreeListEntry* pIter) + : iter(pIter) + { + } + virtual bool equal(const TreeIter& rOther) const override + { + return iter == static_cast<const SalInstanceTreeIter&>(rOther).iter; + } + SvTreeListEntry* iter; +}; + class SalInstanceTreeView : public SalInstanceContainer, public virtual weld::TreeView { protected: diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 877ebaf6e8db..5ae77f856e2f 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -761,7 +761,12 @@ void JSTreeView::set_toggle(int pos, TriState eState, int col) pEntry = m_xTreeView->Next(pEntry); if (pEntry) + { SalInstanceTreeView::set_toggle(pEntry, eState, col); + signal_toggled(iter_col(SalInstanceTreeIter(pEntry), col)); + + notifyDialogState(); + } } void JSTreeView::select(int pos) diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index db5b3d97d6f1..e06438e3e0c5 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -3199,23 +3199,6 @@ IMPL_LINK_NOARG(SalInstanceEntry, ActivateHdl, Edit&, bool) return m_aActivateHdl.Call(*this); } -struct SalInstanceTreeIter : public weld::TreeIter -{ - SalInstanceTreeIter(const SalInstanceTreeIter* pOrig) - : iter(pOrig ? pOrig->iter : nullptr) - { - } - SalInstanceTreeIter(SvTreeListEntry* pIter) - : iter(pIter) - { - } - virtual bool equal(const TreeIter& rOther) const override - { - return iter == static_cast<const SalInstanceTreeIter&>(rOther).iter; - } - SvTreeListEntry* iter; -}; - static SalInstanceTreeView* g_DragSource; // Each row has a cell for the expander image, (and an optional cell for a _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
