vcl menu: Make CloseStartedFrom() virtual to eliminate IsMenuBar() call.

Change-Id: Ifd89b7a9264075b166dd621fcb2c55225e25ea87

1 files changed, 7 insertions, 1 deletions

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 5eaa3c9a9968..8045963174d6 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -187,7 +187,7 @@ protected:
     SAL_DLLPRIVATE void                ImplRemoveDel( ImplMenuDelData &rDel );
 
     /// Close the 'pStartedFrom' menu window.
-    SAL_DLLPRIVATE void CloseStartedFrom();
+    virtual void CloseStartedFrom() = 0;
 
     /// Deactivate the MenuBarWindow.
     SAL_DLLPRIVATE sal_uLong DeactivateMenuBar(sal_uLong nFocusId);
@@ -420,6 +420,9 @@ public:
 
     virtual bool        IsMenuBar() const SAL_OVERRIDE { return true; }
 
+    /// Close the 'pStartedFrom' menu window.
+    virtual void CloseStartedFrom() SAL_OVERRIDE;
+
     void                ShowCloseButton( bool bShow = true );
     bool                HasCloseButton() const { return mbCloseBtnVisible; }
     bool            HasFloatButton() const { return mbFloatBtnVisible; }
@@ -504,6 +507,9 @@ public:
 
     virtual bool        IsMenuBar() const SAL_OVERRIDE { return false; }
 
+    /// Close the 'pStartedFrom' menu window.
+    virtual void CloseStartedFrom() SAL_OVERRIDE;
+
     void                SetText( const OUString& rTitle )  { aTitleText = rTitle; }
     const OUString&     GetText() const                     { return aTitleText; }