summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-20 20:51:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-20 20:54:20 +0000
commit60bb689cd43ea89b4e1886d0f2a15ef366c6dce8 (patch)
tree92e6263f8447ea36e28258f8ddfaa8de14ee6f14
parentf14628438d70f621a48e5ab00a4fa76e8229d831 (diff)
StarOffice 5.1 was released in 1999, fixing this now
Change-Id: I0b6bf947f7d309820334ed1ac6eae5a29b5c69fb
-rw-r--r--include/vcl/menubtn.hxx2
-rw-r--r--vcl/source/control/menubtn.cxx6
2 files changed, 1 insertions, 7 deletions
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index d7dead7049c9..5f791cb1c5d2 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -66,7 +66,7 @@ public:
void ExecuteMenu();
- void SetMenuMode( sal_uInt16 nMode );
+ void SetMenuMode(sal_uInt16 nMode) { mnMenuMode = nMode; }
void SetPopupMenu( PopupMenu* pNewMenu );
PopupMenu* GetPopupMenu() const { return mpMenu; }
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 773d439a6572..9863950f7b72 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -160,12 +160,6 @@ void MenuButton::Select()
maSelectHdl.Call( this );
}
-void MenuButton::SetMenuMode( sal_uInt16 nMode )
-{
- // FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however
- mnMenuMode = nMode;
-}
-
void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
{
if (pNewMenu == mpMenu)