diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-06 14:20:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-06 17:13:58 +0200 |
| commit | 0e07efb1326e3a1ea66619774e25d3d38c8c9074 (patch) | |
| tree | e5e50e730d796409973e4816bbf95231e9dee3c0 /dbaccess | |
| parent | e68febccd3926635da3a64b99b01d3eff0273919 (diff) | |
treelist hidden in data browser
Change-Id: I1f01f4f57d9e711ead86d9d7abf9ef9c7f630fe2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102104
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/inc/helpids.h | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h index 53032a3e6c43..1af25532e2c1 100644 --- a/dbaccess/inc/helpids.h +++ b/dbaccess/inc/helpids.h @@ -24,7 +24,6 @@ #define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER" #define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER" #define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW" -#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX" #define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN" diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index fa9ec7994aee..26a8583230f3 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -297,9 +297,9 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView(), E_TABLE); - m_pTreeView->SetHelpId(HID_TLB_TREELISTBOX); - m_pTreeView->GetWidget().connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry)); + weld::TreeView& rTreeView = m_pTreeView->GetWidget(); + rTreeView.connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry)); m_pTreeView->setCopyHandler(LINK(this, SbaTableQueryBrowser, OnCopyEntry)); @@ -314,13 +314,13 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) getBrowserView()->setTreeView(m_pTreeView); // fill view with data - weld::TreeView& rTreeView = m_pTreeView->GetWidget(); rTreeView.set_sort_order(true); rTreeView.set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){ return OnTreeEntryCompare(rLeft, rRight); }); rTreeView.make_sorted(); m_pTreeView->SetSelChangeHdl(LINK(this, SbaTableQueryBrowser, OnSelectionChange)); + m_pTreeView->show_container(); // TODO getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index be7dca4874a2..cffdc7a3e725 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -126,6 +126,7 @@ namespace dbaui InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType); virtual void dispose() override; virtual ~InterimDBTreeListBox() override; + void show_container() { m_xContainer->show(); } protected: virtual bool DoChildKeyInput(const KeyEvent& rKEvt) override; }; |