convert SvxZoomType to enum class

Change-Id: I7308e848d3f9ac391dc656a145139dabbc792df3

13 files changed, 47 insertions, 47 deletions

diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index d4a7b466ac6d..368a38882390 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -254,7 +254,7 @@ void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom )
     {
         aNewViewOptions.SetZoom( _aNewZoom );
         //#i19975# - consider zoom type.
-        enum SvxZoomType eZoomType = SVX_ZOOM_PERCENT;
+        enum SvxZoomType eZoomType = SvxZoomType::PERCENT;
         aNewViewOptions.SetZoomType( eZoomType );
         mrParentViewShell.ApplyViewOptions( aNewViewOptions );
     }
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 8130678cd9a8..e6e503a459ff 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -504,7 +504,7 @@ void RtfExport::ExportDocument_Impl()
     Strm().WriteCharPtr(m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr()).WriteCharPtr(SAL_NEWLINE_STRING);
     // Zoom
     SwViewShell* pViewShell(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell());
-    if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SVX_ZOOM_PERCENT)
+    if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SvxZoomType::PERCENT)
     {
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_VIEWSCALE);
         OutULong(pViewShell->GetViewOptions()->GetZoom());
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b61b8da529dd..5998a155c285 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -340,9 +340,9 @@ static void WriteDop( WW8Export& rWrt )
     {
         switch ( pViewShell->GetViewOptions()->GetZoomType() )
         {
-            case SVX_ZOOM_WHOLEPAGE: rDop.zkSaved = 1; break;
-            case SVX_ZOOM_PAGEWIDTH: rDop.zkSaved = 2; break;
-            case SVX_ZOOM_OPTIMAL:   rDop.zkSaved = 3; break;
+            case SvxZoomType::WHOLEPAGE: rDop.zkSaved = 1; break;
+            case SvxZoomType::PAGEWIDTH: rDop.zkSaved = 2; break;
+            case SvxZoomType::OPTIMAL:   rDop.zkSaved = 3; break;
             default:                 rDop.zkSaved = 0;
                 rDop.wScaleSaved = pViewShell->GetViewOptions()->GetZoom();
                 break;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3275db852aac..051c866ad984 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1901,10 +1901,10 @@ void SwWW8ImplReader::ImportDop()
         aViewProps[2].Name = "ZoomType";
         //Import zoom type
         switch (pWDop->zkSaved) {
-            case 1:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_WHOLEPAGE); break;
-            case 2:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PAGEWIDTH); break;
-            case 3:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_OPTIMAL);   break;
-            default: aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PERCENT);   break;
+            case 1:  aViewProps[2].Value <<= sal_Int16(SvxZoomType::WHOLEPAGE); break;
+            case 2:  aViewProps[2].Value <<= sal_Int16(SvxZoomType::PAGEWIDTH); break;
+            case 3:  aViewProps[2].Value <<= sal_Int16(SvxZoomType::OPTIMAL);   break;
+            default: aViewProps[2].Value <<= sal_Int16(SvxZoomType::PERCENT);   break;
         }
 
         uno::Reference< uno::XComponentContext > xComponentContext(comphelper::getProcessComponentContext());
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 2650f8cea84b..df8550dc27fa 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -184,7 +184,7 @@ void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView )
         if( bSet )
         {
             const SvxZoomType eType = (SvxZoomType)rViewOptions.GetZoomType();
-            if ( SVX_ZOOM_PERCENT != eType)
+            if ( SvxZoomType::PERCENT != eType)
                 static_cast<SwView*>(GetView())->SetZoom( eType );
         }
         pTempView->InvalidateBorder();
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 011e0300f67d..852751667581 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -166,7 +166,7 @@ SwViewOption::SwViewOption() :
     mbViewLayoutBookMode(false),
     bShowPlaceHolderFields( true ),
     nZoom( 100 ),
-    eZoom( SVX_ZOOM_PERCENT ),
+    eZoom( SvxZoomType::PERCENT ),
     nTblDest(TBL_DEST_CELL)
 {
     // Initialisation is a little simpler now
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 5c8629535f77..d72438c72246 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 = SVX_ZOOM_PERCENT;
+                enum SvxZoomType eType = SvxZoomType::PERCENT;
                 sal_uInt16 nZoomFactor = USHRT_MAX;
                 if(SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOM, true, &pItem))
                 {
@@ -794,14 +794,14 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
             if ( pArgs && SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ) )
             {
                 const sal_uInt16 nCurrentZoom = static_cast<const SvxZoomSliderItem *>(pItem)->GetValue();
-                SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom );
+                SetZoom( SvxZoomType::PERCENT, nCurrentZoom );
             }
         }
         break;
         case SID_ZOOM_IN:
         case SID_ZOOM_OUT:
         {
-            enum SvxZoomType eType = SVX_ZOOM_PERCENT;
+            enum SvxZoomType eType = SvxZoomType::PERCENT;
             const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
             SetZoom(eType,
                     lcl_GetNextZoomStep(pVOpt->GetZoom(), SID_ZOOM_IN == rReq.GetSlot()));
@@ -1726,7 +1726,7 @@ void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor,
                                                const SvxZoomType _eZoomType )
 {
     // #i19975# consider zoom type
-    if ( _eZoomType == SVX_ZOOM_WHOLEPAGE )
+    if ( _eZoomType == SvxZoomType::WHOLEPAGE )
     {
         mnRow = 1;
         mnCol = 1;
@@ -1798,7 +1798,7 @@ bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
                 if(nFactor > MAX_PREVIEW_ZOOM)
                     nFactor = MAX_PREVIEW_ZOOM;
             }
-            SetZoom(SVX_ZOOM_PERCENT, nFactor);
+            SetZoom(SvxZoomType::PERCENT, nFactor);
         }
         bOk = true;
     }
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index e7a6020ff1d7..7d119b63e553 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -811,14 +811,14 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             aUsrPref.setBrowseMode( rDoc.getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE) );
 
         //For the BrowseMode we do not assume a factor.
-        if( aUsrPref.getBrowseMode() && aUsrPref.GetZoomType() != SVX_ZOOM_PERCENT )
+        if( aUsrPref.getBrowseMode() && aUsrPref.GetZoomType() != SvxZoomType::PERCENT )
         {
-            aUsrPref.SetZoomType( SVX_ZOOM_PERCENT );
+            aUsrPref.SetZoomType( SvxZoomType::PERCENT );
             aUsrPref.SetZoom( 100 );
         }
         if(pDocSh->IsPreview())
         {
-            aUsrPref.SetZoomType( SVX_ZOOM_WHOLEPAGE );
+            aUsrPref.SetZoomType( SvxZoomType::WHOLEPAGE );
             aUsrPref.SetViewLayoutBookMode( false );
             aUsrPref.SetViewLayoutColumns( 1 );
         }
@@ -1159,7 +1159,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
                 eZoom = (SvxZoomType) (sal_uInt16)rUserData.getToken(nOff, ';', nPos ).toInt32();
             else
             {
-                eZoom = SVX_ZOOM_PERCENT;
+                eZoom = SvxZoomType::PERCENT;
                 ++nOff;
             }
 
@@ -1342,7 +1342,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                     eZoom = static_cast < SvxZoomType > ( nZoomType );
                 else
                 {
-                    eZoom = SVX_ZOOM_PERCENT;
+                    eZoom = SvxZoomType::PERCENT;
                 }
                 if (bGotIsSelectedFrame)
                 {
@@ -1405,7 +1405,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                 const bool bZoomNeedsViewLayout = bSetViewLayoutSettings &&
                                                   1 < nViewLayoutColumns &&
                                                   bSetViewSettings &&
-                                                  eZoom != SVX_ZOOM_PERCENT;
+                                                  eZoom != SvxZoomType::PERCENT;
 
                 if ( !bZoomNeedsViewLayout )
                     m_pWrtShell->StartAction();
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 1c7bf5cbecce..7379cf3dd6d2 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -229,7 +229,7 @@ void SwView::RecheckBrowseMode()
     CheckVisArea();
 
     SvxZoomType eType;
-    if( GetWrtShell().GetViewOptions()->getBrowseMode() && SVX_ZOOM_PERCENT != (eType = (SvxZoomType)
+    if( GetWrtShell().GetViewOptions()->getBrowseMode() && SvxZoomType::PERCENT != (eType = (SvxZoomType)
         GetWrtShell().GetViewOptions()->GetZoomType()) )
         SetZoom( eType );
     InvalidateBorder();
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 54776c6d4b4f..2bb5d4408795 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1769,7 +1769,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                 if ( SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ))
                 {
                     const sal_uInt16 nCurrentZoom = static_cast<const SvxZoomSliderItem *>(pItem)->GetValue();
-                    SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom );
+                    SetZoom( SvxZoomType::PERCENT, nCurrentZoom );
                 }
 
                 bUp = true;
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 052b8370bbb0..4116e7ee1d36 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -88,7 +88,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
     const SwViewOption *pOpt = m_pWrtShell->GetViewOptions();
     long lLeftMargin = 0;
 
-    if( eZoomType != SVX_ZOOM_PERCENT )
+    if( eZoomType != SvxZoomType::PERCENT )
     {
         const bool bAutomaticViewLayout = 0 == pOpt->GetViewLayoutColumns();
 
@@ -111,14 +111,14 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
             aPageSize.Width() += std::abs( long(rLeftLRSpace.GetLeft()) - long(rLRSpace.GetLeft()) );
         }
 
-        if( SVX_ZOOM_OPTIMAL == eZoomType )
+        if( SvxZoomType::OPTIMAL == eZoomType )
         {
             if (!pPostItMgr->HasNotes() || !pPostItMgr->ShowNotes())
                 aPageSize.Width() -= ( rLRSpace.GetLeft() + rLRSpace.GetRight() + nLeftOfst * 2 );
             lLeftMargin = long(rLRSpace.GetLeft()) + DOCUMENTBORDER + nLeftOfst;
             nFac = aWindowSize.Width() * 100 / aPageSize.Width();
         }
-        else if(SVX_ZOOM_WHOLEPAGE == eZoomType || SVX_ZOOM_PAGEWIDTH == eZoomType )
+        else if(SvxZoomType::WHOLEPAGE == eZoomType || SvxZoomType::PAGEWIDTH == eZoomType )
         {
             const long nOf = DOCUMENTBORDER * 2L;
             long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width();
@@ -126,7 +126,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
             aPageSize.Height() += nOf;
             nFac = aWindowSize.Width() * 100 / nTmpWidth;
 
-            if ( SVX_ZOOM_WHOLEPAGE == eZoomType )
+            if ( SvxZoomType::WHOLEPAGE == eZoomType )
             {
                 long nVisPercent = aWindowSize.Height() * 100 / aPageSize.Height();
                 nFac = std::min( nFac, nVisPercent );
@@ -161,11 +161,11 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
             aOpt.SetReadonly(pOpt->IsReadonly());
             m_pWrtShell->ApplyViewOptions( aOpt );
         }
-        if ( eZoomType != SVX_ZOOM_PERCENT )
+        if ( eZoomType != SvxZoomType::PERCENT )
         {
             Point aPos;
 
-            if ( eZoomType == SVX_ZOOM_WHOLEPAGE )
+            if ( eZoomType == SvxZoomType::WHOLEPAGE )
                 aPos.Y() = m_pWrtShell->GetAnyCurRect(RECT_PAGE).Top() - DOCUMENTBORDER;
             else
             {
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 868072865ad3..04773149ddce 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -69,15 +69,15 @@ bool SwView::IsDocumentBorder()
         return false;
 
     return m_pWrtShell->GetViewOptions()->getBrowseMode() ||
-           SVX_ZOOM_PAGEWIDTH_NOBORDER == (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType();
+           SvxZoomType::PAGEWIDTH_NOBORDER == (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType();
 }
 
 inline long GetLeftMargin( SwView &rView )
 {
     SvxZoomType eType = (SvxZoomType)rView.GetWrtShell().GetViewOptions()->GetZoomType();
     long lRet = rView.GetWrtShell().GetAnyCurRect(RECT_PAGE_PRT).Left();
-    return eType == SVX_ZOOM_PERCENT   ? lRet + DOCUMENTBORDER :
-           eType == SVX_ZOOM_PAGEWIDTH || eType == SVX_ZOOM_PAGEWIDTH_NOBORDER ? 0 :
+    return eType == SvxZoomType::PERCENT   ? lRet + DOCUMENTBORDER :
+           eType == SvxZoomType::PAGEWIDTH || eType == SvxZoomType::PAGEWIDTH_NOBORDER ? 0 :
                                          lRet + DOCUMENTBORDER + nLeftOfst;
 }
 
@@ -1103,7 +1103,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
         if ( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
             pDocSh->SetVisArea(
                             pDocSh->SfxInPlaceObject::GetVisArea() );*/
-        if ( m_pWrtShell->GetViewOptions()->GetZoomType() != SVX_ZOOM_PERCENT &&
+        if ( m_pWrtShell->GetViewOptions()->GetZoomType() != SvxZoomType::PERCENT &&
              !m_pWrtShell->GetViewOptions()->getBrowseMode() )
             _SetZoom( aEditSz, (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType(), 100, true );
         m_pWrtShell->EndAction();
@@ -1139,7 +1139,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
 void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
 {
     const Fraction &rFrac = rX < rY ? rX : rY;
-    SetZoom( SVX_ZOOM_PERCENT, (short) long(rFrac * Fraction( 100, 1 )) );
+    SetZoom( SvxZoomType::PERCENT, (short) long(rFrac * Fraction( 100, 1 )) );
 
     // To minimize rounding errors we also adjust the odd values
     // of the base class if necessary.
@@ -1202,7 +1202,7 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
         else
             nFact = std::min( (long) 600, basegfx::zoomtools::zoomIn( nFact ));
 
-        SetZoom( SVX_ZOOM_PERCENT, nFact );
+        SetZoom( SvxZoomType::PERCENT, nFact );
         bOk = true;
     }
     else if (pWData && CommandWheelMode::ZOOM_SCALE == pWData->GetMode())
@@ -1228,7 +1228,7 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
         if(zoomTarget!=preZoomByVCL)
         {
 
-            SetZoom( SVX_ZOOM_PERCENT, zoomTarget );
+            SetZoom( SvxZoomType::PERCENT, zoomTarget );
         }
         // we move to the center, and add additional tilt from center
         const Point & postZoomTargetCenterInPixels = GetEditWin().LogicToPixel(preZoomTargetCenterInLogic);
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 477a9e49842e..52444be8911a 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -680,19 +680,19 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
             switch (nZoom)
             {
                 case view::DocumentZoomType::OPTIMAL:
-                    eZoom = SVX_ZOOM_OPTIMAL;
+                    eZoom = SvxZoomType::OPTIMAL;
                 break;
                 case view::DocumentZoomType::PAGE_WIDTH:
-                    eZoom = SVX_ZOOM_PAGEWIDTH;
+                    eZoom = SvxZoomType::PAGEWIDTH;
                 break;
                 case view::DocumentZoomType::ENTIRE_PAGE:
-                    eZoom = SVX_ZOOM_WHOLEPAGE;
+                    eZoom = SvxZoomType::WHOLEPAGE;
                 break;
                 case view::DocumentZoomType::BY_VALUE:
-                    eZoom = SVX_ZOOM_PERCENT;
+                    eZoom = SvxZoomType::PERCENT;
                 break;
                 case view::DocumentZoomType::PAGE_WIDTH_EXACT:
-                    eZoom = SVX_ZOOM_PAGEWIDTH_NOBORDER;
+                    eZoom = SvxZoomType::PAGEWIDTH_NOBORDER;
                 break;
                 default:
                     throw IllegalArgumentException(
@@ -882,19 +882,19 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
             sal_Int16 nRet(0);
             switch (mpConstViewOption->GetZoomType())
             {
-                case SVX_ZOOM_OPTIMAL:
+                case SvxZoomType::OPTIMAL:
                     nRet = view::DocumentZoomType::OPTIMAL;
                 break;
-                case SVX_ZOOM_PAGEWIDTH:
+                case SvxZoomType::PAGEWIDTH:
                     nRet = view::DocumentZoomType::PAGE_WIDTH;
                 break;
-                case SVX_ZOOM_WHOLEPAGE:
+                case SvxZoomType::WHOLEPAGE:
                     nRet = view::DocumentZoomType::ENTIRE_PAGE;
                 break;
-                case SVX_ZOOM_PERCENT:
+                case SvxZoomType::PERCENT:
                     nRet = view::DocumentZoomType::BY_VALUE;
                 break;
-                case SVX_ZOOM_PAGEWIDTH_NOBORDER:
+                case SvxZoomType::PAGEWIDTH_NOBORDER:
                     nRet = view::DocumentZoomType::PAGE_WIDTH_EXACT;
                 break;
                 default: