From ab5c5c9d808a5f32d1646de9e1b5cab251b62269 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 18 Nov 2011 15:26:58 -0500 Subject: Fix painting of autofilter buttons. --- sc/source/ui/inc/checklistmenu.hxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sc/source/ui/inc/checklistmenu.hxx') diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 80b180fa358a..34b3be71cbef 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -66,6 +66,7 @@ public: explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); virtual ~ScMenuFloatingWindow(); + virtual void PopupModeEnd(); virtual void MouseMove(const MouseEvent& rMEvt); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); @@ -90,6 +91,7 @@ public: ScMenuFloatingWindow* getParentMenuWindow() const; protected: + virtual void handlePopupEnd(); Size getMenuSize() const; void drawMenuItem(size_t nPos); @@ -151,8 +153,6 @@ private: */ void terminateAllPopupMenus(); - DECL_LINK( PopupEndHdl, void* ); - private: struct MenuItemData @@ -249,6 +249,10 @@ public: ExtendedData* getExtendedData(); void setOKAction(Action* p); + void setPopupEndAction(Action* p); + +protected: + virtual void handlePopupEnd(); private: struct Member @@ -312,6 +316,7 @@ private: ::std::vector maMembers; boost::scoped_ptr mpExtendedData; boost::scoped_ptr mpOKAction; + boost::scoped_ptr mpPopupEndAction; Size maWndSize; /// whole window size. Size maMenuSize; /// size of all menu items combined. -- cgit