diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-06 08:45:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-06 07:46:49 +0000 |
| commit | 24ae6e86671c0729a6a6ea7da86b262b4fdd1c0f (patch) | |
| tree | 037080994ff44308b8f77061af53d1aca09640ad /sfx2 | |
| parent | 9fc8b4a3fe9b369093fc133979f84ed7b21b125f (diff) | |
convert ScrollingMode to scoped enum
Change-Id: Ice1628ba09998be455fd6a77a044cb403235d462
Reviewed-on: https://gerrit.libreoffice.org/34914
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/frmhtml.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/iframe.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index af567e90e4a5..c27201e6de92 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -40,9 +40,9 @@ static sal_Char const sHTML_SC_auto[] = "AUTO"; static HTMLOptionEnum<ScrollingMode> const aScrollingTable[] = { - { sHTML_SC_yes, ScrollingYes }, - { sHTML_SC_no, ScrollingNo }, - { sHTML_SC_auto, ScrollingAuto }, + { sHTML_SC_yes, ScrollingMode::Yes }, + { sHTML_SC_no, ScrollingMode::No }, + { sHTML_SC_auto, ScrollingMode::Auto }, { nullptr, (ScrollingMode)0 } }; @@ -93,7 +93,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( bMarginHeight = true; break; case HTML_O_SCROLLING: - pFrame->SetScrollingMode( rOption.GetEnum( aScrollingTable, ScrollingAuto ) ); + pFrame->SetScrollingMode( rOption.GetEnum( aScrollingTable, ScrollingMode::Auto ) ); break; case HTML_O_FRAMEBORDER: { diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index a23126be9c80..5eb4fc22bb88 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -40,7 +40,7 @@ struct SfxFrameDescriptor_Impl SfxFrameDescriptor::SfxFrameDescriptor() : aMargin( -1, -1 ), - eScroll( ScrollingAuto ), + eScroll( ScrollingMode::Auto ), bHasBorder( true ), bHasBorderSet( false ), bResizeHorizontal( true ), diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 1ca63db3194a..ad44a090ef2a 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -262,14 +262,14 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons { bool bIsAutoScroll; if ( (aAny >>= bIsAutoScroll) && bIsAutoScroll ) - maFrmDescr.SetScrollingMode( ScrollingAuto ); + maFrmDescr.SetScrollingMode( ScrollingMode::Auto ); } break; case WID_FRAME_IS_SCROLLING_MODE: { bool bIsScroll; if ( aAny >>= bIsScroll ) - maFrmDescr.SetScrollingMode( bIsScroll ? ScrollingYes : ScrollingNo ); + maFrmDescr.SetScrollingMode( bIsScroll ? ScrollingMode::Yes : ScrollingMode::No ); } break; case WID_FRAME_IS_BORDER: @@ -337,13 +337,13 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) break; case WID_FRAME_IS_AUTO_SCROLL: { - bool bIsAutoScroll = ( maFrmDescr.GetScrollingMode() == ScrollingAuto ); + bool bIsAutoScroll = ( maFrmDescr.GetScrollingMode() == ScrollingMode::Auto ); aAny <<= bIsAutoScroll; } break; case WID_FRAME_IS_SCROLLING_MODE: { - bool bIsScroll = ( maFrmDescr.GetScrollingMode() == ScrollingYes ); + bool bIsScroll = ( maFrmDescr.GetScrollingMode() == ScrollingMode::Yes ); aAny <<= bIsScroll; } break; |