include/vcl/menubtn.hxx | 1 - vcl/source/control/menubtn.cxx | 19 ++++++------------- 2 files changed, 6 insertions(+), 14 deletions(-)
New commits: commit d3e33f7ba85bf80c130aff3a3957c56b625c34cf Author: Caolán McNamara <[email protected]> Date: Fri Oct 28 13:03:42 2016 +0100 ImplInitMenuButtonData can be folded into ctor now because theres no ResId loader anymore Change-Id: Id90786d710fe75e47c162fd00ad7fd672b9cee30 diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index f5056c1..e6b7015 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -40,7 +40,6 @@ private: Link<MenuButton*,void> maActivateHdl; Link<MenuButton*,void> maSelectHdl; - SAL_DLLPRIVATE void ImplInitMenuButtonData(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void ); MenuButton( const MenuButton & ) = delete; diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 6d1c677..b3a0167 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -26,16 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -void MenuButton::ImplInitMenuButtonData() -{ - mnDDStyle = PushButtonDropdownStyle::MenuButton; - - mpMenuTimer = nullptr; - mpMenu = nullptr; - mnCurItemId = 0; - mbDelayMenu = false; -} - void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) @@ -73,10 +63,13 @@ OString MenuButton::GetCurItemIdent() const } MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) - : PushButton( WINDOW_MENUBUTTON ) + : PushButton(WINDOW_MENUBUTTON) + , mpMenuTimer(nullptr) + , mnCurItemId(0) + , mbDelayMenu(false) { - ImplInitMenuButtonData(); - ImplInit( pParent, nWinBits ); + mnDDStyle = PushButtonDropdownStyle::MenuButton; + ImplInit(pParent, nWinBits); } MenuButton::~MenuButton()
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
