From 04a8ba2084950f998d791edad29739c124c8c4b8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 2 Sep 2016 14:57:18 +0200 Subject: convert ScrollType to scoped enum Change-Id: I6dd02d4f7df028dada6cfd5d767a6ec1b1c1efe1 --- sw/source/uibase/uiview/pview.cxx | 2 +- sw/source/uibase/uiview/viewport.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sw') diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 24423f52d76a..fb869051b73e 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1426,7 +1426,7 @@ IMPL_LINK_TYPED( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) if(!GetViewShell()) return; if( !pScrollbar->IsHoriScroll() && - pScrollbar->GetType() == SCROLL_DRAG && + pScrollbar->GetType() == ScrollType::Drag && Help::IsQuickHelpEnabled() && GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow()) { diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 7be971df4bf0..89b3e1478e04 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -686,11 +686,11 @@ IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) if ( GetWrtShell().ActionPend() ) return; - if ( pScrollbar->GetType() == SCROLL_DRAG ) + if ( pScrollbar->GetType() == ScrollType::Drag ) m_pWrtShell->EnableSmooth( false ); if(!m_pWrtShell->GetViewOptions()->getBrowseMode() && - pScrollbar->GetType() == SCROLL_DRAG) + pScrollbar->GetType() == ScrollType::Drag) { // Here comment out again if it is not desired to scroll together: // The end scrollhandler invalidate the FN_STAT_PAGE, @@ -746,7 +746,7 @@ IMPL_LINK_TYPED( SwView, ScrollHdl, ScrollBar *, p, void ) else EndScrollHdl(pScrollbar); - if ( pScrollbar->GetType() == SCROLL_DRAG ) + if ( pScrollbar->GetType() == ScrollType::Drag ) m_pWrtShell->EnableSmooth( true ); } -- cgit