diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-11 10:37:46 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-12 06:57:04 +0000 |
commit | 0f4ac20e0456b32995f7a3aff4e46b59e64704a6 (patch) | |
tree | ac4a2e26907013b29ea1f87cc6757290c2d6de34 /sw | |
parent | e1efe3359c5105f1347ab7527aeff109e62b7e3f (diff) |
Convert RulerType to scoped enum
Change-Id: I2233b70e5413bfa3156011e1b3306d539003795b
Reviewed-on: https://gerrit.libreoffice.org/24879
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/docvw/edtwin3.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewmdi.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx index 07037d57ed3a..745bbd4ca864 100644 --- a/sw/source/uibase/docvw/edtwin3.cxx +++ b/sw/source/uibase/docvw/edtwin3.cxx @@ -86,9 +86,9 @@ void FrameNotify( SwViewShell* pVwSh, FlyMode eMode ) bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, bool bVerticalMode) { SvxRuler& rRuler = bVerticalMode ? m_rView.GetVRuler() : m_rView.GetHRuler(); - return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) && - !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) && - !rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2)); + return (!rRuler.StartDocDrag( rMEvt, RulerType::Border ) && + !rRuler.StartDocDrag( rMEvt, RulerType::Margin1) && + !rRuler.StartDocDrag( rMEvt, RulerType::Margin2)); } // #i23726# @@ -98,7 +98,7 @@ bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt, const bool bVerticalMode ) { SvxRuler& rRuler = bVerticalMode ? m_rView.GetVRuler() : m_rView.GetHRuler(); - return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT); + return !rRuler.StartDocDrag( rMEvt, RulerType::Indent); } TableChgMode GetTableChgDefaultMode() diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 18023fd3e1df..33812bb0beed 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -523,11 +523,11 @@ IMPL_LINK_TYPED( SwView, ExecRulerClick, Ruler *, pRuler, void ) OUString sDefPage; switch( pRuler->GetClickType() ) { - case RULER_TYPE_DONTKNOW: - case RULER_TYPE_OUTSIDE: - case RULER_TYPE_INDENT: - case RULER_TYPE_MARGIN1: - case RULER_TYPE_MARGIN2: + case RulerType::DontKnow: + case RulerType::Outside: + case RulerType::Indent: + case RulerType::Margin1: + case RulerType::Margin2: sDefPage = "indents"; break; default: |