vcl/inc/qt5/QtMenu.hxx | 1 -
vcl/qt5/QtMenu.cxx | 4 ----
2 files changed, 5 deletions(-)
New commits:
commit 4a537cf77affc4f1f2e2e5be9ff0b1ff11724509
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Apr 6 16:42:24 2022 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Apr 6 17:39:10 2022 +0200
Qt drop unused QtMenu::mpCloseButton
Change-Id: I988cabf4c07d5efd298c53b696f6d114f4f594bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132637
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/vcl/inc/qt5/QtMenu.hxx b/vcl/inc/qt5/QtMenu.hxx
index f39be7e8d506..11f3f00c5aa6 100644
--- a/vcl/inc/qt5/QtMenu.hxx
+++ b/vcl/inc/qt5/QtMenu.hxx
@@ -49,7 +49,6 @@ private:
std::unique_ptr<QMenu> mpOwnedQMenu;
// pointer to QMenu owned by the corresponding QtMenuItem or self (->
mpOwnedQMenu)
QMenu* mpQMenu;
- QPushButton* mpCloseButton;
void DoFullMenuUpdate(Menu* pMenuBar);
static void NativeItemText(OUString& rItemText);
diff --git a/vcl/qt5/QtMenu.cxx b/vcl/qt5/QtMenu.cxx
index 71b81c22ba3e..50cb1d057431 100644
--- a/vcl/qt5/QtMenu.cxx
+++ b/vcl/qt5/QtMenu.cxx
@@ -40,7 +40,6 @@ QtMenu::QtMenu(bool bMenuBar)
, mbMenuBar(bMenuBar)
, mpQMenuBar(nullptr)
, mpQMenu(nullptr)
- , mpCloseButton(nullptr)
{
}
@@ -430,8 +429,6 @@ void QtMenu::SetFrame(const SalFrame* pFrame)
mpQMenuBar = new QMenuBar();
pMainWindow->setMenuBar(mpQMenuBar);
-
- mpCloseButton = nullptr;
mpQMenu = nullptr;
DoFullMenuUpdate(mpVCLMenu);
@@ -665,7 +662,6 @@ void QtMenu::ShowCloseButton(bool bShow)
pButton->setToolTip(toQString(VclResId(SV_HELPTEXT_CLOSEDOCUMENT)));
mpQMenuBar->setCornerWidget(pButton, Qt::TopRightCorner);
connect(pButton, &QPushButton::clicked, this,
&QtMenu::slotCloseDocument);
- mpCloseButton = pButton;
}
if (bShow)
