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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 8279dd21c241..d5c6cbda7474 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -888,12 +888,12 @@ void SwHTMLParser::InsertFloatingFrame() xSet->setPropertyValue("FrameURL", uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) ) ); xSet->setPropertyValue("FrameName", uno::makeAny( aName ) ); - if ( eScroll == ScrollingAuto ) + if ( eScroll == ScrollingMode::Auto ) xSet->setPropertyValue("FrameIsAutoScroll", uno::makeAny( true ) ); else xSet->setPropertyValue("FrameIsScrollingMode", - uno::makeAny( eScroll == ScrollingYes ) ); + uno::makeAny( eScroll == ScrollingMode::Yes ) ); xSet->setPropertyValue("FrameIsBorder", uno::makeAny( bHasBorder ) ); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index a6746a4a144e..1b20f32bb9c1 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -763,7 +763,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra RES_FRMATR_END ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth); - ScrollingMode eScrollMode = ScrollingAuto; + ScrollingMode eScrollMode = ScrollingMode::Auto; bool bHasBorder = false; bool bIsBorderSet = false; Size aMargin( SIZE_NOT_SET, SIZE_NOT_SET ); @@ -795,7 +795,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra case CTF_FRAME_DISPLAY_SCROLLBAR: { bool bYes = *o3tl::doAccess<bool>(rProp.maValue); - eScrollMode = bYes ? ScrollingYes : ScrollingNo; + eScrollMode = bYes ? ScrollingMode::Yes : ScrollingMode::No; } break; case CTF_FRAME_DISPLAY_BORDER: @@ -854,12 +854,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra xSet->setPropertyValue("FrameName", makeAny( OUString( rName ) ) ); - if ( eScrollMode == ScrollingAuto ) + if ( eScrollMode == ScrollingMode::Auto ) xSet->setPropertyValue("FrameIsAutoScroll", makeAny( true ) ); else xSet->setPropertyValue("FrameIsScrollingMode", - makeAny( eScrollMode == ScrollingYes ) ); + makeAny( eScrollMode == ScrollingMode::Yes ) ); if ( bIsBorderSet ) xSet->setPropertyValue("FrameIsBorder", diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 29b1298898ba..4af6c0aa8676 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -271,8 +271,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { try { - ScrollingMode eScroll = ScrollingAuto; - if( pScrollingItem && pScrollingItem->GetValue() <= ScrollingAuto ) + ScrollingMode eScroll = ScrollingMode::Auto; + if( pScrollingItem && pScrollingItem->GetValue() <= (int)ScrollingMode::Auto ) eScroll = (ScrollingMode) pScrollingItem->GetValue(); Size aMargin; @@ -284,12 +284,12 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( pNameItem ) xSet->setPropertyValue("FrameName", uno::makeAny( OUString( pNameItem->GetValue() ) ) ); - if ( eScroll == ScrollingAuto ) + if ( eScroll == ScrollingMode::Auto ) xSet->setPropertyValue("FrameIsAutoScroll", uno::makeAny( true ) ); else xSet->setPropertyValue("FrameIsScrollingMode", - uno::makeAny( eScroll == ScrollingYes ) ); + uno::makeAny( eScroll == ScrollingMode::Yes ) ); if ( pBorderItem ) xSet->setPropertyValue("FrameIsBorder", |