Kaydet (Commit) e7bb2118 authored tarafından Caolán McNamara's avatar Caolán McNamara

a scoped enumeration cannot be redeclared as an unscoped enumeration

Change-Id: If63ae932469ebc723a54f32604c3368f3a1f2688
üst 5e49b9b4
...@@ -772,7 +772,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) ...@@ -772,7 +772,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
} }
if( pArgs ) if( pArgs )
{ {
enum SvxZoomType eType = SvxZoomType::PERCENT; SvxZoomType eType = SvxZoomType::PERCENT;
sal_uInt16 nZoomFactor = USHRT_MAX; sal_uInt16 nZoomFactor = USHRT_MAX;
if(SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOM, true, &pItem)) if(SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOM, true, &pItem))
{ {
...@@ -801,7 +801,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) ...@@ -801,7 +801,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
case SID_ZOOM_IN: case SID_ZOOM_IN:
case SID_ZOOM_OUT: case SID_ZOOM_OUT:
{ {
enum SvxZoomType eType = SvxZoomType::PERCENT; SvxZoomType eType = SvxZoomType::PERCENT;
const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
SetZoom(eType, SetZoom(eType,
lcl_GetNextZoomStep(pVOpt->GetZoom(), SID_ZOOM_IN == rReq.GetSlot())); lcl_GetNextZoomStep(pVOpt->GetZoom(), SID_ZOOM_IN == rReq.GetSlot()));
......
...@@ -1728,7 +1728,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) ...@@ -1728,7 +1728,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
if ( pSet && SfxItemState::SET == pSet->GetItemState(SID_ATTR_ZOOM, true, &pItem)) if ( pSet && SfxItemState::SET == pSet->GetItemState(SID_ATTR_ZOOM, true, &pItem))
{ {
enum SvxZoomType eType = static_cast<const SvxZoomItem *>(pItem)->GetType(); SvxZoomType eType = static_cast<const SvxZoomItem *>(pItem)->GetType();
SetZoom( eType, static_cast<const SvxZoomItem *>(pItem)->GetValue() ); SetZoom( eType, static_cast<const SvxZoomItem *>(pItem)->GetValue() );
} }
bUp = true; bUp = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment