commit d1051a203a7f89997128313f6a4f065f51f6c00d
author Caolán McNamara <caolanm@redhat.com> Sun Jun 26 19:27:31 2016 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun Jun 26 20:06:33 2016 +0100
tree e3222f01f70f0fd91afab2f6e47dcaad8ee4f367
parent 9b6a02d8d48c135103aaa980fd27eec07b9223b6

mpOwnMenu is unused since menubuttons stopped getting loaded from .res files

Change-Id: I11a1ff3d5427156c9d8485dd9294782459c11f8c

include/vcl/menubtn.hxx

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;

vcl/source/control/menubtn.cxx

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();
}