[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/unodatbr.cxx      |    2 +-
 dbaccess/source/ui/control/dbtreelistbox.cxx |    4 ++--
 dbaccess/source/ui/inc/dbtreelistbox.hxx     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b0f7621fa53c20f4a74b82141d2ee03fcbd08578
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 10 21:02:33 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 22 09:36:55 2021 +0200

    tdf#139447 crash on dragging query/table from explorer to calc sheet
    
    Change-Id: Ic827cb967a9a9cb78f28a23707813aeec8381cd4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117019
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 2496ec8bc2b6..8b6904afa6ff 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -295,7 +295,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 d63beff8c346..de5ff835deea 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)
 {
     InitControlBase(&GetWidget());
 }
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index af68b9e9b8d7..d5e37022ec64 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -117,7 +117,7 @@ namespace dbaui
                                , public TreeListBox
     {
     public:
-        InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType);
+        InterimDBTreeListBox(vcl::Window* pParent);
         virtual void dispose() override;
         virtual ~InterimDBTreeListBox() override;
         void show_container() { m_xContainer->show(); }