From ecec9afe852d3bca019b6b44a40d8be39e0f58f4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 23 Mar 2015 15:20:12 +0200
Subject: convert SVX_ZOOM_ENABLE constants to enum class
Change-Id: Iead354b95b832edd72eb8e881855f228fd85be70
---
sc/source/ui/view/prevwsh.cxx | 2 +-
sc/source/ui/view/tabvwsh3.cxx | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'sc')
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 3bc36f77c799..e79dd92921bb 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -829,7 +829,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
case SID_ATTR_ZOOM:
{
SvxZoomItem aZoom( eZoom, nZoom, nWhich );
- aZoom.SetValueSet( SVX_ZOOM_ENABLE_ALL & ~SVX_ZOOM_ENABLE_OPTIMAL );
+ aZoom.SetValueSet( SvxZoomEnableFlags::ALL & ~SvxZoomEnableFlags::OPTIMAL );
rSet.Put( aZoom );
}
break;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index e7da39649637..bee292715927 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -640,16 +640,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
ScMarkData& rMark = GetViewData().GetMarkData();
- sal_uInt16 nBtnFlags = SVX_ZOOM_ENABLE_50
- | SVX_ZOOM_ENABLE_75
- | SVX_ZOOM_ENABLE_100
- | SVX_ZOOM_ENABLE_150
- | SVX_ZOOM_ENABLE_200
- | SVX_ZOOM_ENABLE_WHOLEPAGE
- | SVX_ZOOM_ENABLE_PAGEWIDTH;
+ SvxZoomEnableFlags nBtnFlags = SvxZoomEnableFlags::N50
+ | SvxZoomEnableFlags::N75
+ | SvxZoomEnableFlags::N100
+ | SvxZoomEnableFlags::N150
+ | SvxZoomEnableFlags::N200
+ | SvxZoomEnableFlags::WHOLEPAGE
+ | SvxZoomEnableFlags::PAGEWIDTH;
if ( rMark.IsMarked() || rMark.IsMultiMarked() )
- nBtnFlags = nBtnFlags | SVX_ZOOM_ENABLE_OPTIMAL;
+ nBtnFlags = nBtnFlags | SvxZoomEnableFlags::OPTIMAL;
aZoomItem.SetValueSet( nBtnFlags );
aSet.Put( aZoomItem );
--
cgit