dbaccess/source/ui/browser/unodatbr.cxx | 2 +-
dbaccess/source/ui/control/dbtreelistbox.cxx | 4 ++--
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 +-
vcl/CppunitTest_vcl_svm_test.mk | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 3c325bd525d7726395db733e684b84b1659bd41a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jun 10 21:02:33 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 11 10:16:54 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/+/117018
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
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;
commit 3514b18f173c1ed7ab32e9d8820a588ba0d880d7
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Jun 11 09:21:15 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jun 11 10:16:44 2021 +0200
CppunitTest_vcl_svm_test: add missing basegfx link
Missing probably because
https://gerrit.libreoffice.org/c/core/+/116967/1 was merged before its
https://gerrit.libreoffice.org/c/core/+/116959/4 parent.
Change-Id: I0c6304c98f27e1f24ee615e4580c8ad7458bf79b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117027
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk
index 92b4dbaafd14..5d8071c42ff3 100644
--- a/vcl/CppunitTest_vcl_svm_test.mk
+++ b/vcl/CppunitTest_vcl_svm_test.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_set_include,vcl_svm_test,\
))
$(eval $(call gb_CppunitTest_use_libraries,vcl_svm_test, \
+ basegfx \
comphelper \
cppu \
cppuhelper \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
