From 8303e7ed668fbcbd0ba75bd9dd259f03073ffd46 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 14 Jun 2019 10:41:11 +0200 Subject: loplugin:unusedfields improvements tighten up the only calling write-only methods part of the analysis Change-Id: I5bc6fdf0ce51940653317e8a48c5241705c90d4c Reviewed-on: https://gerrit.libreoffice.org/74022 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basctl/source/basicide/basobj2.cxx | 7 +------ basctl/source/basicide/macrodlg.cxx | 3 +-- basctl/source/basicide/moduldlg.cxx | 4 +--- basctl/source/basicide/moduldlg.hxx | 3 +-- 4 files changed, 4 insertions(+), 13 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 380107c4e1ce..1f627d0fd7ec 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -67,12 +67,7 @@ void Organize(weld::Window* pParent, sal_Int16 tabId) { EnsureIde(); - EntryDescriptor aDesc; - if (Shell* pShell = GetShell()) - if (BaseWindow* pCurWin = pShell->GetCurWindow()) - aDesc = pCurWin->CreateEntryDescriptor(); - - auto xDlg(std::make_shared(pParent, tabId, aDesc)); + auto xDlg(std::make_shared(pParent, tabId)); weld::DialogController::runAsync(xDlg, [](int) {}); } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 41a99a51307e..3f7585decefe 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -744,8 +744,7 @@ IMPL_LINK(MacroChooser, ButtonHdl, weld::Button&, rButton, void) StoreMacroDescription(); m_xBasicBox->get_selected(m_xBasicBoxIter.get()); - EntryDescriptor aDesc = m_xBasicBox->GetEntryDescriptor(m_xBasicBoxIter.get()); - auto xDlg(std::make_shared(m_xDialog.get(), 0, aDesc)); + auto xDlg(std::make_shared(m_xDialog.get(), 0)); weld::DialogController::runAsync(xDlg, [this](sal_Int32 nRet) { if (nRet == RET_OK) // not only closed { diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 11f4946a7fde..1c113f7d9d35 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -181,14 +181,12 @@ void Shell::CopyDialogResources( } // OrganizeDialog -OrganizeDialog::OrganizeDialog(weld::Window* pParent, sal_Int16 tabId, - EntryDescriptor const & rDesc ) +OrganizeDialog::OrganizeDialog(weld::Window* pParent, sal_Int16 tabId ) : GenericDialogController(pParent, "modules/BasicIDE/ui/organizedialog.ui", "OrganizeDialog") , m_xTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) , m_xModulePage(new ObjectPage(m_xTabCtrl->get_page("modules"), "ModulePage", BrowseMode::Modules, this)) , m_xDialogPage(new ObjectPage(m_xTabCtrl->get_page("dialogs"), "DialogPage", BrowseMode::Dialogs, this)) , m_xLibPage(new LibPage(m_xTabCtrl->get_page("libraries"), this)) - , m_aCurEntry(rDesc) { m_xTabCtrl->connect_enter_page(LINK(this, OrganizeDialog, ActivatePageHdl)); diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 60633dd280ac..99a425a2b032 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -201,12 +201,11 @@ private: std::unique_ptr m_xModulePage; std::unique_ptr m_xDialogPage; std::unique_ptr m_xLibPage; - EntryDescriptor m_aCurEntry; DECL_LINK(ActivatePageHdl, const OString&, void); public: - OrganizeDialog(weld::Window* pParent, sal_Int16 tabId, EntryDescriptor const & rDesc); + OrganizeDialog(weld::Window* pParent, sal_Int16 tabId); virtual ~OrganizeDialog() override; }; -- cgit