diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-23 15:20:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-24 09:36:58 +0200 |
| commit | ecec9afe852d3bca019b6b44a40d8be39e0f58f4 (patch) | |
| tree | dc030eaa8f80a0dc3ff6103507ed4dabf9558bbd /sd | |
| parent | 5d37fa2a710e3bd76d3f1e18d1d66b8a4ab15030 (diff) | |
convert SVX_ZOOM_ENABLE constants to enum class
Change-Id: Iead354b95b832edd72eb8e881855f228fd85be70
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuscale.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index bee412780a8e..9729951fd721 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -72,7 +72,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) { SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); boost::scoped_ptr<SvxZoomItem> pZoomItem; - sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; + SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL; nValue = (sal_Int16) mpWindow->GetZoom(); @@ -96,14 +96,14 @@ void FuScale::DoExecute( SfxRequest& rReq ) if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) ) // || ( mpView->GetMarkedObjectList().GetMarkCount() == 0 ) ) { - nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL; + nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; } } else if( mpViewShell->ISA( OutlineViewShell ) ) { - nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL; - nZoomValues &= ~SVX_ZOOM_ENABLE_WHOLEPAGE; - nZoomValues &= ~SVX_ZOOM_ENABLE_PAGEWIDTH; + nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; + nZoomValues &= ~SvxZoomEnableFlags::WHOLEPAGE; + nZoomValues &= ~SvxZoomEnableFlags::PAGEWIDTH; } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index f31950507693..d3421cbd4157 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -590,13 +590,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) pZoomItem.reset(new SvxZoomItem( SvxZoomType::PERCENT, nZoom )); // constrain area - sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; + SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) ) // || ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 0 ) ) { - nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL; + nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; } pZoomItem->SetValueSet( nZoomValues ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 494119aeecd5..bc7ec61bc3a8 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1279,10 +1279,10 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) boost::scoped_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom )); // limit area - sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; - nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL; - nZoomValues &= ~SVX_ZOOM_ENABLE_WHOLEPAGE; - nZoomValues &= ~SVX_ZOOM_ENABLE_PAGEWIDTH; + SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL; + nZoomValues &= ~SvxZoomEnableFlags::OPTIMAL; + nZoomValues &= ~SvxZoomEnableFlags::WHOLEPAGE; + nZoomValues &= ~SvxZoomEnableFlags::PAGEWIDTH; pZoomItem->SetValueSet( nZoomValues ); rSet.Put( *pZoomItem ); |