[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/uibase/uiview/pview.cxx |    4 ++--
 sw/source/uibase/uiview/view2.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e7bb2118ac056dd9552865170e07576296c3eba0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 24 10:08:58 2015 +0000

    a scoped enumeration cannot be redeclared as an unscoped enumeration
    
    Change-Id: If63ae932469ebc723a54f32604c3368f3a1f2688

diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 83cc23f..40c2696 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -772,7 +772,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
             }
             if( pArgs )
             {
-                enum SvxZoomType eType = SvxZoomType::PERCENT;
+                SvxZoomType eType = SvxZoomType::PERCENT;
                 sal_uInt16 nZoomFactor = USHRT_MAX;
                 if(SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOM, true, &pItem))
                 {
@@ -801,7 +801,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
         case SID_ZOOM_IN:
         case SID_ZOOM_OUT:
         {
-            enum SvxZoomType eType = SvxZoomType::PERCENT;
+            SvxZoomType eType = SvxZoomType::PERCENT;
             const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
             SetZoom(eType,
                     lcl_GetNextZoomStep(pVOpt->GetZoom(), SID_ZOOM_IN == rReq.GetSlot()));
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index f79372b..fc58b26 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1728,7 +1728,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 
                 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() );
                 }
                 bUp = true;