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 /sd/source | |
| parent | aa82339bb6bbf38b2e56083115f9f485713c545e (diff) | |
convert SVXRULER_SUPPORT constants to scoped enum
Change-Id: Id6c2571b5a060530437509a8dc203dc1a346f773
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/inc/Ruler.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/view/sdruler.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 8ad5147b28ef..03f4da28376d 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -37,7 +37,7 @@ public: DrawViewShell& rViewSh, ::vcl::Window* pParent, ::sd::Window* pWin, - sal_uInt16 nRulerFlags, + SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~Ruler(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 62b0b46b5c1a..b5674ce6cfdf 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -482,14 +482,14 @@ SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, bool bIsFirst) { Ruler* pRuler; WinBits aWBits; - sal_uInt16 nFlags = SVXRULER_SUPPORT_OBJECT; + SvxRulerSupportFlags nFlags = SvxRulerSupportFlags::OBJECT; if ( bIsFirst ) { aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; - nFlags |= ( SVXRULER_SUPPORT_SET_NULLOFFSET | - SVXRULER_SUPPORT_TABS | - SVXRULER_SUPPORT_PARAGRAPH_MARGINS ); // Neu + nFlags |= ( SvxRulerSupportFlags::SET_NULLOFFSET | + SvxRulerSupportFlags::TABS | + SvxRulerSupportFlags::PARAGRAPH_MARGINS ); // Neu } else aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER; @@ -524,7 +524,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) { Ruler* pRuler; WinBits aWBits = WB_VSCROLL | WB_3DLOOK | WB_BORDER; - sal_uInt16 nFlags = SVXRULER_SUPPORT_OBJECT; + SvxRulerSupportFlags nFlags = SvxRulerSupportFlags::OBJECT; pRuler = VclPtr<Ruler>::Create(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 12e3a6089834..95d4c6ca52a6 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -68,7 +68,7 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt } } -Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdView(NULL) , pSdWin(pWin) |