diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 10:53:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 12:16:38 +0200 |
commit | 77e9216ca1073caa0dcec23ef89808cc7f80fc06 (patch) | |
tree | 71ea2c3841f1a1017123dec44552239d74fd7a4a /dbaccess | |
parent | 81903d443116c643a9ff92d92c092812abc7f57d (diff) |
loplugin:unusedfields
and filter out the weld fields, since we're not touching them yet
Change-Id: I3cc23c46d2650f13cb29c7d381687939d23e2882
Reviewed-on: https://gerrit.libreoffice.org/80104
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 17 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/WTypeSelect.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/indexdialog.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WTypeSelect.cxx | 3 |
4 files changed, 1 insertions, 23 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index c0bbcae30eda..4bf1dc2c1f75 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -72,7 +72,6 @@ namespace dbaui const Reference< XComponentContext >& _rxContext) : GenericDialogController(pParent, "dbaccess/ui/indexdesigndialog.ui", "IndexDesignDialog") , m_xConnection(_rxConnection) - , m_bEditingActive(false) , m_bEditAgain(false) , m_bNoHandlerCall(false) , m_xContext(_rxContext) @@ -146,7 +145,7 @@ namespace dbaui void DbaIndexDialog::updateToolbox() { - m_xActions->set_item_sensitive("ID_INDEX_NEW", !m_bEditingActive); + m_xActions->set_item_sensitive("ID_INDEX_NEW", true); int nSelected = m_xIndexList->get_selected_index(); bool bSelectedAnything = nSelected != -1; @@ -427,17 +426,6 @@ namespace dbaui IMPL_LINK_NOARG(DbaIndexDialog, OnCloseDialog, weld::Button&, void) { - if (m_bEditingActive) - { - OSL_ENSURE(!m_bEditAgain, "DbaIndexDialog::OnCloseDialog: somebody was faster than hell!"); - // this means somebody entered a new name, which was invalid, which cause us to posted us an event, - // and before the event arrived the user clicked onto "close". VERY fast, this user... - m_xIndexList->end_editing(); - if (m_bEditAgain) - // could not commit the new name (started a new - asynchronous - edit trial) - return; - } - // the currently selected entry std::unique_ptr<weld::TreeIter> xSelected(m_xIndexList->make_iterator()); // the selected index @@ -661,9 +649,6 @@ namespace dbaui { //TODO m_xIndexList->EndSelection(); - if (m_bEditingActive) - m_xIndexList->end_editing(); - std::unique_ptr<weld::TreeIter> xSelected(m_xIndexList->make_iterator()); if (!m_xIndexList->get_selected(xSelected.get())) xSelected.reset(); diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index b431f4e17250..4a0f240a788f 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -66,14 +66,11 @@ namespace dbaui DECL_LINK(CommandHdl, const CommandEvent&, bool); - OWizTypeSelect* m_pParentTabPage; - Link<weld::TreeView&, void> m_aChangeHdl; public: OWizTypeSelectList(std::unique_ptr<weld::TreeView> xControl); void SetPKey(bool bPKey) { m_bPKey = bPKey; } - void SetParentTabPage(OWizTypeSelect* pParentTabPage) { m_pParentTabPage = pParentTabPage; } weld::TreeView* GetWidget() { return m_xControl.get(); } OUString get_selected_id() const { return m_xControl->get_selected_id(); } void show() { m_xControl->show(); } diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 15598d99c04b..eda10e99c695 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -40,7 +40,6 @@ namespace dbaui std::unique_ptr<OIndexCollection> m_xIndexes; std::unique_ptr<weld::TreeIter> m_xPreviousSelection; - bool m_bEditingActive; bool m_bEditAgain; bool m_bNoHandlerCall; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 59c115f9334c..390a6a5a7a0f 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -221,8 +221,6 @@ OWizTypeSelect::OWizTypeSelect(weld::Container* pPage, OCopyTableWizard* pWizard , m_bAutoIncrementEnabled(false) , m_bDuplicateName(false) { - m_xColumnNames->SetParentTabPage(this); - m_xColumnNames->connect_changed(LINK(this,OWizTypeSelect,ColumnSelectHdl)); m_xTypeControl->Show(); @@ -334,7 +332,6 @@ IMPL_LINK_NOARG(OWizTypeSelect, ButtonClickHdl, weld::Button&, void) OWizTypeSelectList::OWizTypeSelectList(std::unique_ptr<weld::TreeView> xControl) : m_xControl(std::move(xControl)) , m_bPKey(false) - , m_pParentTabPage(nullptr) { m_xControl->connect_popup_menu(LINK(this, OWizTypeSelectList, CommandHdl)); } |