summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-06-10 21:02:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-06-11 10:16:54 +0200
commit3c325bd525d7726395db733e684b84b1659bd41a (patch)
tree71f66bd9ceeeeddc5dab62864a70695f2cb6198d
parent3514b18f173c1ed7ab32e9d8820a588ba0d880d7 (diff)
tdf#139447 crash on dragging query/table from explorer to calc sheet
Change-Id: Ic827cb967a9a9cb78f28a23707813aeec8381cd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117018 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx4
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index e8c1c1f5920b..685db87d432e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -296,7 +296,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
- m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView(), E_TABLE);
+ m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView());
weld::TreeView& rTreeView = m_pTreeView->GetWidget();
rTreeView.connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry));
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 4c415007709c..0935caf8ff5d 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -53,9 +53,9 @@ using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::view;
-InterimDBTreeListBox::InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType)
+InterimDBTreeListBox::InterimDBTreeListBox(vcl::Window* pParent)
: InterimItemWindow(pParent, "dbaccess/ui/dbtreelist.ui", "DBTreeList")
- , TreeListBox(m_xBuilder->weld_tree_view("treeview"), bSQLType)
+ , TreeListBox(m_xBuilder->weld_tree_view("treeview"), true)
, m_xStatusBar(m_xBuilder->weld_label("statusbar"))
{
InitControlBase(&GetWidget());
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 7beb90a6d69d..7682841a23ac 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -119,7 +119,7 @@ namespace dbaui
private:
std::unique_ptr<weld::Label> m_xStatusBar;
public:
- InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType);
+ InterimDBTreeListBox(vcl::Window* pParent);
virtual void dispose() override;
weld::Label& GetStatusBar() { return *m_xStatusBar; }
virtual ~InterimDBTreeListBox() override;