diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-09-15 20:13:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-09-15 20:16:26 +0200 |
| commit | 2636ab883adbcb1f6593787934c6d6d3fff67c21 (patch) | |
| tree | 243452cb8ec05cd4672cd169dd55e057729f89e2 /include | |
| parent | 44c394344668134c4d842aa93a454218ccdfec7c (diff) | |
vcl menu: Rename CloseStartedFrom() to ClosePopup() + adapt code.
Fixes a regression from fcc49e118c9da28309dce3389d111a546cba19cd (clicking
outside of an opened menubar's menu did not close the menubar).
Change-Id: Ib6efddd6c250b173469772c7b2ae642b5ef609aa
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 9fdabcb080e0..a4576959eb51 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -186,7 +186,7 @@ protected: SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); /// Close the 'pStartedFrom' menu window. - virtual void CloseStartedFrom() = 0; + virtual void ClosePopup(Menu* pMenu) = 0; /// Deactivate the MenuBarWindow. virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId); @@ -420,7 +420,7 @@ public: virtual bool IsMenuBar() const SAL_OVERRIDE { return true; } /// Close the 'pStartedFrom' menu window. - virtual void CloseStartedFrom() SAL_OVERRIDE; + virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE; /// Deactivate the MenuBarWindow. virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) SAL_OVERRIDE; @@ -513,7 +513,7 @@ public: virtual bool IsMenuBar() const SAL_OVERRIDE { return false; } /// Close the 'pStartedFrom' menu window. - virtual void CloseStartedFrom() SAL_OVERRIDE; + virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE; void SetText( const OUString& rTitle ) { aTitleText = rTitle; } const OUString& GetText() const { return aTitleText; } |