diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-08 12:23:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-08 20:26:14 +0200 |
| commit | b8128ae611a23e81544f7e4b96ec196a8594f840 (patch) | |
| tree | db65120c895eaddd7305fe48d653da2e331ce3db /dbaccess/source/ui | |
| parent | 9130c1abc65aedd0358d9f9dd4b9108b7e68f70f (diff) | |
no need for ScrollBarBox if bg is already the desired color
Change-Id: I94f83a1c2142b8b8712fc3527a90dad4f0babb9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/inc/JoinTableView.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 4dedc70e3c6c..1b6c8c79ed16 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -22,7 +22,6 @@ #include <vcl/window.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> -#include <vcl/scrbar.hxx> #include <vcl/vclptr.hxx> #include <vcl/transfer.hxx> @@ -53,7 +52,6 @@ namespace dbaui { VclPtr<ScrollAdaptor> m_aHScrollBar; VclPtr<ScrollAdaptor> m_aVScrollBar; - VclPtr<vcl::Window> m_pCornerWindow; VclPtr<OJoinTableView> m_pTableView; protected: diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 5cd3ec1f41ed..98d08374df91 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -68,11 +68,12 @@ using namespace ::com::sun::star::lang; OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParent) ,m_aHScrollBar( VclPtr<ScrollAdaptor>::Create(this, true) ) ,m_aVScrollBar( VclPtr<ScrollAdaptor>::Create(this, false) ) - ,m_pCornerWindow(VclPtr<ScrollBarBox>::Create(this, WB_3DLOOK)) ,m_pTableView(nullptr) { - // ScrollBars + StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); + SetBackground(aSystemStyle.GetFaceColor()); + // ScrollBars GetHScrollBar().SetRange( Range(0, 1000) ); GetVScrollBar().SetRange( Range(0, 1000) ); @@ -81,7 +82,6 @@ OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParen GetHScrollBar().Show(); GetVScrollBar().Show(); - m_pCornerWindow->Show(); // normally we should be SCROLL_PANE SetAccessibleRole(AccessibleRole::SCROLL_PANE); @@ -96,7 +96,6 @@ void OScrollWindowHelper::dispose() { m_aHScrollBar.disposeAndClear(); m_aVScrollBar.disposeAndClear(); - m_pCornerWindow.disposeAndClear(); m_pTableView.clear(); vcl::Window::dispose(); } @@ -134,11 +133,6 @@ void OScrollWindowHelper::Resize() Size( nVScrollWidth, aTotalOutputSize.Height()-nHScrollHeight ) ); - m_pCornerWindow->SetPosSizePixel( - Point( aTotalOutputSize.Width() - nVScrollWidth, aTotalOutputSize.Height() - nHScrollHeight), - Size( nVScrollWidth, nHScrollHeight ) - ); - GetHScrollBar().SetPageSize( aTotalOutputSize.Width() ); GetHScrollBar().SetVisibleSize( aTotalOutputSize.Width() ); |