include/vcl/menubtn.hxx | 1 - vcl/source/control/menubtn.cxx | 2 -- 2 files changed, 3 deletions(-)
New commits: commit d1051a203a7f89997128313f6a4f065f51f6c00d Author: Caolán McNamara <[email protected]> Date: Sun Jun 26 19:27:31 2016 +0100 mpOwnMenu is unused since menubuttons stopped getting loaded from .res files Change-Id: I11a1ff3d5427156c9d8485dd9294782459c11f8c diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 0e57668..c0abc93 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -36,7 +36,6 @@ private: friend class VclBuilder; Timer* mpMenuTimer; - VclPtr<PopupMenu> mpOwnMenu; VclPtr<PopupMenu> mpMenu; sal_uInt16 mnCurItemId; sal_uInt16 mnMenuMode; diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 918e10b..2db2bd0 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -32,7 +32,6 @@ void MenuButton::ImplInitMenuButtonData() mpMenuTimer = nullptr; mpMenu = nullptr; - mpOwnMenu = nullptr; mnCurItemId = 0; mnMenuMode = 0; } @@ -88,7 +87,6 @@ MenuButton::~MenuButton() void MenuButton::dispose() { delete mpMenuTimer; - mpOwnMenu.disposeAndClear(); PushButton::dispose(); }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
