vcl/source/window/menu.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit f6d13aa7e1f0dd3baafc70795008722b46867b76 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 19 12:55:00 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Oct 23 10:44:53 2018 +0200 wrong pointer check since... commit 2636ab883adbcb1f6593787934c6d6d3fff67c21 Date: Mon Sep 15 20:13:54 2014 +0200 vcl menu: Rename CloseStartedFrom() to ClosePopup() + adapt code. Change-Id: Ie30f6d907907551e23e592b8502107e75c333f2e Reviewed-on: https://gerrit.libreoffice.org/62045 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 62739890e3aa..a2d6083c234f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2700,7 +2700,7 @@ void PopupMenu::ClosePopup(Menu* pMenu) { MenuFloatingWindow* p = dynamic_cast<MenuFloatingWindow*>(ImplGetWindow()); PopupMenu *pPopup = dynamic_cast<PopupMenu*>(pMenu); - if (p && pMenu) + if (p && pPopup) p->KillActivePopup(pPopup); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
