diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewport.cxx | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 9b72fd4ef8d1..86aba605789b 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -330,7 +330,7 @@ void SwAddressControl_Impl::Command( const CommandEvent& rCEvt ) case COMMAND_AUTOSCROLL: { const CommandWheelData* pWheelData = rCEvt.GetWheelData(); - if(pWheelData && !pWheelData->IsHorz() && COMMAND_WHEEL_ZOOM != pWheelData->GetMode()) + if(pWheelData && !pWheelData->IsHorz() && CommandWheelMode::ZOOM != pWheelData->GetMode()) { HandleScrollCommand( rCEvt, 0, m_pScrollBar ); } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 0da4e9694aa9..42530be1dea5 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -986,7 +986,7 @@ void SwAssignFieldsControl::Command( const CommandEvent& rCEvt ) case COMMAND_AUTOSCROLL: { const CommandWheelData* pWheelData = rCEvt.GetWheelData(); - if(pWheelData && !pWheelData->IsHorz() && COMMAND_WHEEL_ZOOM != pWheelData->GetMode()) + if(pWheelData && !pWheelData->IsHorz() && CommandWheelMode::ZOOM != pWheelData->GetMode()) { HandleScrollCommand( rCEvt, 0, &m_aVScroll ); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index fc2a2daef1ad..39e51cce24de 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -419,7 +419,7 @@ void TextViewOutWin::Command( const CommandEvent& rCEvt ) case COMMAND_AUTOSCROLL: { const CommandWheelData* pWData = rCEvt.GetWheelData(); - if( !pWData || COMMAND_WHEEL_ZOOM != pWData->GetMode() ) + if( !pWData || CommandWheelMode::ZOOM != pWData->GetMode() ) { ((SwSrcEditWindow*)GetParent())->HandleWheelCommand( rCEvt ); } @@ -766,7 +766,7 @@ void SwSrcEditWindow::Command( const CommandEvent& rCEvt ) case COMMAND_AUTOSCROLL: { const CommandWheelData* pWData = rCEvt.GetWheelData(); - if( !pWData || COMMAND_WHEEL_ZOOM != pWData->GetMode() ) + if( !pWData || CommandWheelMode::ZOOM != pWData->GetMode() ) HandleScrollCommand( rCEvt, pHScrollbar, pVScrollbar ); } break; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 476307952304..9375cb18763c 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1780,7 +1780,7 @@ bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt ) { bool bOk = false; const CommandWheelData* pWData = rCEvt.GetWheelData(); - if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) + if( pWData && CommandWheelMode::ZOOM == pWData->GetMode() ) { //only the Preference shouldn't control the Zoom, it is better to detect AT tools running. So the bridge can be used here if (!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()) diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 3528c8315592..c7509b926a67 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -1194,7 +1194,7 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) { bool bOk = false; const CommandWheelData* pWData = rCEvt.GetWheelData(); - if (pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode()) + if (pWData && CommandWheelMode::ZOOM == pWData->GetMode()) { long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); if( 0L > pWData->GetDelta() ) @@ -1205,7 +1205,7 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) SetZoom( SVX_ZOOM_PERCENT, nFact ); bOk = true; } - else if (pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode()) + else if (pWData && CommandWheelMode::ZOOM_SCALE == pWData->GetMode()) { // mobile touch zoom (pinch) section // remember the center location to reach in logic @@ -1240,7 +1240,7 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) // scrolling the deltaX deltaY Point deltaPoint( deltaX, deltaY ); - CommandWheelData cmd( 0, 0, 0, COMMAND_WHEEL_SCROLL, 0, false, true); + CommandWheelData cmd( 0, 0, 0, CommandWheelMode::SCROLL, 0, false, true); CommandEvent event(deltaPoint , COMMAND_WHEEL, true, &cmd ); m_pEditWin->HandleScrollCommand(event, m_pHScrollbar, m_pVScrollbar); } @@ -1249,13 +1249,13 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) } else { - if (pWData && pWData->GetMode()==COMMAND_WHEEL_SCROLL) + if (pWData && pWData->GetMode()==CommandWheelMode::SCROLL) { // This influences whether quick help is shown m_bWheelScrollInProgress=true; } - if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && + if (pWData && (CommandWheelMode::SCROLL==pWData->GetMode()) && (COMMAND_WHEEL_PAGESCROLL == pWData->GetScrollLines())) { if (pWData->GetDelta()<0) |