diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-23 13:13:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:39 +0200 |
| commit | d478a1cd6426aba6a502963862ace5a9f6182450 (patch) | |
| tree | 08fde85c22d342a6b6be17f431fe6fb8383391f7 /sw | |
| parent | aa82339bb6bbf38b2e56083115f9f485713c545e (diff) | |
convert SVXRULER_SUPPORT constants to scoped enum
Change-Id: Id6c2571b5a060530437509a8dc203dc1a346f773
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/swruler.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/swruler.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 35938f1cebf3..94c23771b8da 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -30,7 +30,7 @@ public: SwViewShell* pViewSh, vcl::Window* pParent, SwEditWin* pWin, - sal_uInt16 nRulerFlags, + SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~SwCommentRuler (); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 6e635be84eae..748aa9ceccb6 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -35,7 +35,7 @@ #define CONTROL_TRIANGLE_PAD 3 // Constructor -SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEditWin* pWin, SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle | WB_HSCROLL) , mpViewShell(pViewSh) , mpSwWin(pWin) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index a3da88c0fcc7..ab632ebf3d1d 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -700,8 +700,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_pVScrollbar(0), m_pScrollFill(VclPtr<ScrollBarBox>::Create( &_pFrame->GetWindow(), _pFrame->GetFrame().GetParentFrame() ? 0 : WB_SIZEABLE )), m_pVRuler(VclPtr<SvxRuler>::Create(&GetViewFrame()->GetWindow(), m_pEditWin, - SVXRULER_SUPPORT_TABS | SVXRULER_SUPPORT_PARAGRAPH_MARGINS_VERTICAL| - SVXRULER_SUPPORT_BORDERS | SVXRULER_SUPPORT_REDUCED_METRIC, + SvxRulerSupportFlags::TABS | SvxRulerSupportFlags::PARAGRAPH_MARGINS_VERTICAL| + SvxRulerSupportFlags::BORDERS | SvxRulerSupportFlags::REDUCED_METRIC, GetViewFrame()->GetBindings(), WB_VSCROLL | WB_EXTRAFIELD | WB_BORDER )), m_pTogglePageBtn(0), @@ -847,11 +847,11 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) } SAL_INFO( "sw.ui", "after create WrtShell" ); m_pHRuler = VclPtr<SwCommentRuler>::Create(m_pWrtShell, &GetViewFrame()->GetWindow(), m_pEditWin, - SVXRULER_SUPPORT_TABS | - SVXRULER_SUPPORT_PARAGRAPH_MARGINS | - SVXRULER_SUPPORT_BORDERS | - SVXRULER_SUPPORT_NEGATIVE_MARGINS| - SVXRULER_SUPPORT_REDUCED_METRIC, + SvxRulerSupportFlags::TABS | + SvxRulerSupportFlags::PARAGRAPH_MARGINS | + SvxRulerSupportFlags::BORDERS | + SvxRulerSupportFlags::NEGATIVE_MARGINS| + SvxRulerSupportFlags::REDUCED_METRIC, GetViewFrame()->GetBindings(), WB_STDRULER | WB_EXTRAFIELD | WB_BORDER); |