summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-26 19:27:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-26 20:06:33 +0100
commitd1051a203a7f89997128313f6a4f065f51f6c00d (patch)
treee3222f01f70f0fd91afab2f6e47dcaad8ee4f367
parent9b6a02d8d48c135103aaa980fd27eec07b9223b6 (diff)
mpOwnMenu is unused since menubuttons stopped getting loaded from .res files
Change-Id: I11a1ff3d5427156c9d8485dd9294782459c11f8c
-rw-r--r--include/vcl/menubtn.hxx1
-rw-r--r--vcl/source/control/menubtn.cxx2
2 files changed, 0 insertions, 3 deletions
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 0e57668037f4..c0abc93cd157 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 918e10b000ab..2db2bd060fa7 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();
}