diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-05 11:37:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-05 17:05:04 +0200 |
| commit | 5ae01ffa70549b1a4d9f166d0528a8d04a5dc858 (patch) | |
| tree | 3006d72ec6befba6f8d81bc55bcdcccc0b27a2cf /basctl/source/dlged | |
| parent | f5109c38e2d5bd608fc6b94fde75e73d70e0c4f7 (diff) | |
tdf#117388 use native scrollbar under gtk in basic editor
Change-Id: Id8f2b4fdc40116bb28053dc6fbbf6fa86e6808fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137862
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basctl/source/dlged')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 6 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 8 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedview.cxx | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 81fa3f14e837..e61249650c0f 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -237,7 +237,6 @@ DlgEditor::DlgEditor ( SetDialog(xDialogModel); } - DlgEditor::~DlgEditor() { aMarkIdle.Stop(); @@ -245,7 +244,6 @@ DlgEditor::~DlgEditor() ::comphelper::disposeComponent( m_xControlContainer ); } - Reference< awt::XControlContainer > const & DlgEditor::GetWindowControlContainer() { if (!m_xControlContainer.is()) @@ -253,8 +251,7 @@ Reference< awt::XControlContainer > const & DlgEditor::GetWindowControlContainer return m_xControlContainer; } - -void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS ) +void DlgEditor::SetScrollBars(ScrollAdaptor* pHS, ScrollAdaptor* pVS) { pHScroll = pHS; pVScroll = pVS; @@ -262,7 +259,6 @@ void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS ) InitScrollBars(); } - void DlgEditor::InitScrollBars() { DBG_ASSERT( pHScroll, "DlgEditor::InitScrollBars: no horizontal scroll bar!" ); diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index c43b22c8e16a..7f1a0388eeaa 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/scrbar.hxx> +#include <svtools/scrolladaptor.hxx> #include <svx/svdview.hxx> #include <dlgedfunc.hxx> #include <dlged.hxx> @@ -45,8 +45,8 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) tools::Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() ); aOutRect = rWindow.PixelToLogic( aOutRect ); - ScrollBar* pHScroll = rParent.GetHScroll(); - ScrollBar* pVScroll = rParent.GetVScroll(); + ScrollAdaptor* pHScroll = rParent.GetHScroll(); + ScrollAdaptor* pVScroll = rParent.GetVScroll(); tools::Long nDeltaX = pHScroll->GetLineSize(); tools::Long nDeltaY = pVScroll->GetLineSize(); @@ -294,7 +294,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) else { // scroll page - ScrollBar* pScrollBar = ( nX != 0 ) ? rParent.GetHScroll() : rParent.GetVScroll(); + ScrollAdaptor* pScrollBar = ( nX != 0 ) ? rParent.GetHScroll() : rParent.GetVScroll(); if ( pScrollBar ) { tools::Long nRangeMin = pScrollBar->GetRangeMin(); diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index d6c67b7e9f7a..81271d38f8bd 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -21,8 +21,8 @@ #include <dlged.hxx> #include <dlgedpage.hxx> +#include <svtools/scrolladaptor.hxx> #include <vcl/canvastools.hxx> -#include <vcl/scrbar.hxx> #include <dlgedobj.hxx> |