diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-23 14:40:02 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-24 09:36:57 +0200 |
commit | 5d37fa2a710e3bd76d3f1e18d1d66b8a4ab15030 (patch) | |
tree | b472de3b77857a725b3a469e648151b12a7bb9d9 /sc | |
parent | 23e0b0ba4b67a402a89b3752ae5aede1c5249cc8 (diff) |
convert SvxZoomType to enum class
Change-Id: I7308e848d3f9ac391dc656a145139dabbc792df3
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/appoptio.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/appluno.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 26 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabview2.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 4 |
10 files changed, 54 insertions, 54 deletions
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index abe4658a9e09..59bcd4097bc0 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -60,7 +60,7 @@ void ScAppOptions::SetDefaults() eMetric = FUNIT_INCH; // default for others nZoom = 100; - eZoomType = SVX_ZOOM_PERCENT; + eZoomType = SvxZoomType::PERCENT; bSynchronizeZoom = true; nStatusFunc = SUBTOTAL_FUNC_SUM; bAutoComplete = true; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index dff6fd0f96c9..002a571436bb 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -455,19 +455,19 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( short nVal = ScUnoHelpFunctions::GetInt16FromAny( aValue ); if ( nVal < 0 ) { - SvxZoomType eType = SVX_ZOOM_PERCENT; + SvxZoomType eType = SvxZoomType::PERCENT; switch (nVal) { - case SC_ZOOMVAL_OPTIMAL: eType = SVX_ZOOM_OPTIMAL; break; - case SC_ZOOMVAL_WHOLEPAGE: eType = SVX_ZOOM_WHOLEPAGE; break; - case SC_ZOOMVAL_PAGEWIDTH: eType = SVX_ZOOM_PAGEWIDTH; break; + case SC_ZOOMVAL_OPTIMAL: eType = SvxZoomType::OPTIMAL; break; + case SC_ZOOMVAL_WHOLEPAGE: eType = SvxZoomType::WHOLEPAGE; break; + case SC_ZOOMVAL_PAGEWIDTH: eType = SvxZoomType::PAGEWIDTH; break; } aAppOpt.SetZoomType( eType ); } else if ( nVal >= MINZOOM && nVal <= MAXZOOM ) { aAppOpt.SetZoom( nVal ); - aAppOpt.SetZoomType( SVX_ZOOM_PERCENT ); + aAppOpt.SetZoomType( SvxZoomType::PERCENT ); } bSaveApp = true; } @@ -549,10 +549,10 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp sal_Int16 nZoomVal = 0; switch ( aAppOpt.GetZoomType() ) { - case SVX_ZOOM_PERCENT: nZoomVal = aAppOpt.GetZoom(); break; - case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break; - case SVX_ZOOM_WHOLEPAGE: nZoomVal = SC_ZOOMVAL_WHOLEPAGE; break; - case SVX_ZOOM_PAGEWIDTH: nZoomVal = SC_ZOOMVAL_PAGEWIDTH; break; + case SvxZoomType::PERCENT: nZoomVal = aAppOpt.GetZoom(); break; + case SvxZoomType::OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break; + case SvxZoomType::WHOLEPAGE: nZoomVal = SC_ZOOMVAL_WHOLEPAGE; break; + case SvxZoomType::PAGEWIDTH: nZoomVal = SC_ZOOMVAL_PAGEWIDTH; break; default: { // added to avoid warnings diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 7f7ac0def73d..f60d22cd0cae 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1472,19 +1472,19 @@ sal_Int16 ScTabViewObj::GetZoomType(void) const SvxZoomType eZoomType = pViewSh->GetViewData().GetView()->GetZoomType(); switch (eZoomType) { - case SVX_ZOOM_PERCENT: + case SvxZoomType::PERCENT: aZoomType = view::DocumentZoomType::BY_VALUE; break; - case SVX_ZOOM_OPTIMAL: + case SvxZoomType::OPTIMAL: aZoomType = view::DocumentZoomType::OPTIMAL; break; - case SVX_ZOOM_WHOLEPAGE: + case SvxZoomType::WHOLEPAGE: aZoomType = view::DocumentZoomType::ENTIRE_PAGE; break; - case SVX_ZOOM_PAGEWIDTH: + case SvxZoomType::PAGEWIDTH: aZoomType = view::DocumentZoomType::PAGE_WIDTH; break; - case SVX_ZOOM_PAGEWIDTH_NOBORDER: + case SvxZoomType::PAGEWIDTH_NOBORDER: aZoomType = view::DocumentZoomType::PAGE_WIDTH_EXACT; break; } @@ -1504,26 +1504,26 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType) switch (aZoomType) { case view::DocumentZoomType::BY_VALUE: - eZoomType = SVX_ZOOM_PERCENT; + eZoomType = SvxZoomType::PERCENT; break; case view::DocumentZoomType::OPTIMAL: - eZoomType = SVX_ZOOM_OPTIMAL; + eZoomType = SvxZoomType::OPTIMAL; break; case view::DocumentZoomType::ENTIRE_PAGE: - eZoomType = SVX_ZOOM_WHOLEPAGE; + eZoomType = SvxZoomType::WHOLEPAGE; break; case view::DocumentZoomType::PAGE_WIDTH: - eZoomType = SVX_ZOOM_PAGEWIDTH; + eZoomType = SvxZoomType::PAGEWIDTH; break; case view::DocumentZoomType::PAGE_WIDTH_EXACT: - eZoomType = SVX_ZOOM_PAGEWIDTH_NOBORDER; + eZoomType = SvxZoomType::PAGEWIDTH_NOBORDER; break; default: - eZoomType = SVX_ZOOM_OPTIMAL; + eZoomType = SvxZoomType::OPTIMAL; } sal_Int16 nZoom(GetZoom()); sal_Int16 nOldZoom(nZoom); - if ( eZoomType == SVX_ZOOM_PERCENT ) + if ( eZoomType == SvxZoomType::PERCENT ) { if ( nZoom < MINZOOM ) nZoom = MINZOOM; if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; @@ -1533,13 +1533,13 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType) switch ( eZoomType ) { - case SVX_ZOOM_WHOLEPAGE: - case SVX_ZOOM_PAGEWIDTH: + case SvxZoomType::WHOLEPAGE: + case SvxZoomType::PAGEWIDTH: pView->SetZoomType( eZoomType, true ); break; default: - pView->SetZoomType( SVX_ZOOM_PERCENT, true ); + pView->SetZoomType( SvxZoomType::PERCENT, true ); } SetZoom( nZoom ); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 6793f201de75..3bc36f77c799 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -117,7 +117,7 @@ void ScPreviewShell::Construct( vcl::Window* pParent ) if (mpFrameWindow) mpFrameWindow->SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl)); - eZoom = SVX_ZOOM_WHOLEPAGE; + eZoom = SvxZoomType::WHOLEPAGE; pCorner = new ScrollBarBox( pParent, WB_SIZEABLE ); @@ -215,9 +215,9 @@ void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) Size aOutSize( rSize ); pPreview->SetPosSizePixel( rPos, aOutSize ); - if ( SVX_ZOOM_WHOLEPAGE == eZoom ) + if ( SvxZoomType::WHOLEPAGE == eZoom ) pPreview->SetZoom( pPreview->GetOptimalZoom(false) ); - else if ( SVX_ZOOM_PAGEWIDTH == eZoom ) + else if ( SvxZoomType::PAGEWIDTH == eZoom ) pPreview->SetZoom( pPreview->GetOptimalZoom(true) ); UpdateNeededScrollBars(); @@ -502,7 +502,7 @@ bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt ) if ( nNew != nOld ) { - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; pPreview->SetZoom( (sal_uInt16)nNew ); } @@ -627,7 +627,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) sal_uInt16 nZoom = 100; bool bCancel = false; - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; if ( pReqArgs ) { @@ -641,7 +641,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) else { SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); - SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); + SvxZoomItem aZoomItem( SvxZoomType::PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); aSet.Put( aZoomItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -669,11 +669,11 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) { switch ( eZoom ) { - case SVX_ZOOM_OPTIMAL: - case SVX_ZOOM_WHOLEPAGE: + case SvxZoomType::OPTIMAL: + case SvxZoomType::WHOLEPAGE: nZoom = pPreview->GetOptimalZoom(false); break; - case SVX_ZOOM_PAGEWIDTH: + case SvxZoomType::PAGEWIDTH: nZoom = pPreview->GetOptimalZoom(true); break; default: @@ -692,7 +692,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) sal_uInt16 nNew = pPreview->GetZoom() + 20 ; nNew -= nNew % 20; pPreview->SetZoom( nNew ); - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; rReq.Done(); } break; @@ -701,7 +701,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) sal_uInt16 nNew = pPreview->GetZoom() - 1; nNew -= nNew % 20; pPreview->SetZoom( nNew ); - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; rReq.Done(); } break; @@ -716,7 +716,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) case SID_ATTR_ZOOMSLIDER: { const SfxPoolItem* pItem; - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, true, &pItem ) ) { const sal_uInt16 nCurrentZoom = static_cast<const SvxZoomSliderItem*>(pItem)->GetValue(); @@ -933,7 +933,7 @@ void ScPreviewShell::ReadUserData(const OUString& rData, bool /* bBrowse */) sal_Int32 nIndex = 0; pPreview->SetZoom((sal_uInt16)rData.getToken(0, SC_USERDATA_SEP, nIndex).toInt32()); pPreview->SetPageNo(rData.getToken(0, SC_USERDATA_SEP, nIndex).toInt32()); - eZoom = SVX_ZOOM_PERCENT; + eZoom = SvxZoomType::PERCENT; } } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 5f30db49c821..706856f4cfe0 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -750,7 +750,7 @@ void ScTabView::UpdateVarZoom() // update variable zoom types SvxZoomType eZoomType = GetZoomType(); - if ( eZoomType != SVX_ZOOM_PERCENT && !bInZoomUpdate ) + if ( eZoomType != SvxZoomType::PERCENT && !bInZoomUpdate ) { bInZoomUpdate = true; const Fraction& rOldX = GetViewData().GetZoomX(); @@ -998,7 +998,7 @@ bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) // scroll wheel doesn't set the AppOptions default bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom(); - SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom ); + SetZoomType( SvxZoomType::PERCENT, bSyncZoom ); Fraction aFract( nNew, 100 ); SetZoom( aFract, aFract, bSyncZoom ); PaintGrid(); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index c79d356065ae..fc9b1a892abd 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1174,11 +1174,11 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) switch ( eType ) { - case SVX_ZOOM_PERCENT: // rZoom ist kein besonderer prozentualer Wert + case SvxZoomType::PERCENT: // rZoom ist kein besonderer prozentualer Wert nZoom = nOldZoom; break; - case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se + case SvxZoomType::OPTIMAL: // nZoom entspricht der optimalen Gr"o\se { ScMarkData& rMark = aViewData.GetMarkData(); ScDocument* pDoc = aViewData.GetDocument(); @@ -1272,8 +1272,8 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) } break; - case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder - case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite + case SvxZoomType::WHOLEPAGE: // nZoom entspricht der ganzen Seite oder + case SvxZoomType::PAGEWIDTH: // nZoom entspricht der Seitenbreite { SCTAB nCurTab = aViewData.GetTabNo(); ScDocument* pDoc = aViewData.GetDocument(); @@ -1340,7 +1340,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom ) ( aPageSize.Height() * nPPTY ) ); long nNew = nZoomX; - if (eType == SVX_ZOOM_WHOLEPAGE && nZoomY < nNew) + if (eType == SvxZoomType::WHOLEPAGE && nZoomY < nNew) nNew = nZoomY; nZoom = (sal_uInt16) nNew; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 8253b37d35df..e7da39649637 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -681,7 +681,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( !bCancel ) { - if ( eNewZoomType == SVX_ZOOM_PERCENT ) + if ( eNewZoomType == SvxZoomType::PERCENT ) { if ( nZoom < MINZOOM ) nZoom = MINZOOM; if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; @@ -694,13 +694,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) switch ( eNewZoomType ) { - case SVX_ZOOM_WHOLEPAGE: - case SVX_ZOOM_PAGEWIDTH: + case SvxZoomType::WHOLEPAGE: + case SvxZoomType::PAGEWIDTH: SetZoomType( eNewZoomType, bSyncZoom ); break; default: - SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom ); + SetZoomType( SvxZoomType::PERCENT, bSyncZoom ); } } @@ -734,7 +734,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) const sal_uInt16 nCurrentZoom = static_cast<const SvxZoomSliderItem *>(pItem)->GetValue(); if( nCurrentZoom ) { - SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom ); + SetZoomType( SvxZoomType::PERCENT, bSyncZoom ); if (!GetViewData().IsPagebreakMode()) { ScAppOptions aNewOpt = pScMod->GetAppOptions(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index f8724ad19942..a943245a69c4 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1718,7 +1718,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, if ( GetViewData().GetDocShell()->IsPreview() ) { // preview for template dialog: always show whole page - SetZoomType( SVX_ZOOM_WHOLEPAGE, true ); // zoom value is recalculated at next Resize + SetZoomType( SvxZoomType::WHOLEPAGE, true ); // zoom value is recalculated at next Resize } else { diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 6c2896db131c..ada241426a08 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -289,7 +289,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) const Fraction& rOldY = GetViewData().GetZoomY(); sal_uInt16 nZoom = (sal_uInt16)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator()); - rSet.Put( SvxZoomItem( SVX_ZOOM_PERCENT, nZoom, nWhich ) ); + rSet.Put( SvxZoomItem( SvxZoomType::PERCENT, nZoom, nWhich ) ); } break; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 9efad26ee977..db824d56a1cd 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -76,7 +76,7 @@ static bool bMoveArea = false; // Member? sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; // Member! ScViewDataTable::ScViewDataTable() : - eZoomType( SVX_ZOOM_PERCENT ), + eZoomType( SvxZoomType::PERCENT ), aZoomX( 1,1 ), aZoomY( 1,1 ), aPageZoomX( 3,5 ), // Page-Default: 60% @@ -301,7 +301,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) : pOptions ( new ScViewOptions ), pSpellingView ( NULL ), aLogicMode ( MAP_100TH_MM ), - eDefZoomType( SVX_ZOOM_PERCENT ), + eDefZoomType( SvxZoomType::PERCENT ), aDefZoomX ( 1,1 ), aDefZoomY ( 1,1 ), aDefPageZoomX( 3,5 ), |