diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-02-19 23:41:06 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-02-20 09:37:32 +0900 |
| commit | 8e12daed4f79f4835dc2d8b83609e306617837ca (patch) | |
| tree | 33d0ecc81442317c6faf918457677ad81eb57efe | |
| parent | a4a457100a3a6e9f59113e82c9d0b12786273671 (diff) | |
bZoomEnable was always true
This completes dc9ce37f90da7f845e38547bd12d53bea646beae.
Change-Id: I0a840d01a40942016e32ec0547618bc44d94c48d
| -rw-r--r-- | sw/source/ui/uiview/pview.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index c2256f89dfe5..531e19d2dd47 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -962,8 +962,6 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) sal_uInt16 nWhich = aIter.FirstWhich(); OSL_ENSURE(nWhich, "empty set"); SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); - // zoom has to be disabled if Accessibility support is switched on - sal_Bool bZoomEnabled = sal_True; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) { @@ -1008,8 +1006,6 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) case SID_ATTR_ZOOM: case FN_STAT_ZOOM: { - if(bZoomEnabled) - { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); SvxZoomItem aZoom((SvxZoomType)pVOpt->GetZoomType(), pVOpt->GetZoom()); @@ -1020,41 +1016,28 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) SVX_ZOOM_ENABLE_150| SVX_ZOOM_ENABLE_200); rSet.Put( aZoom ); - } - else - rSet.DisableItem(nWhich); } break; case SID_ATTR_ZOOMSLIDER : { - if(bZoomEnabled) - { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); const sal_uInt16 nCurrentZoom = pVOpt->GetZoom(); SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM, MAXZOOM ); aZoomSliderItem.AddSnappingPoint( 100 ); rSet.Put( aZoomSliderItem ); - } - else - rSet.DisableItem(nWhich); } break; case FN_PREVIEW_ZOOM: { - if(bZoomEnabled) - { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); rSet.Put(SfxUInt16Item(nWhich, pVOpt->GetZoom())); - } - else - rSet.DisableItem(nWhich); } break; case SID_ZOOM_IN: case SID_ZOOM_OUT: { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - if(!bZoomEnabled || (SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| + if((SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| (SID_ZOOM_IN == nWhich && pVOpt->GetZoom() <= MIN_PREVIEW_ZOOM)) { rSet.DisableItem(nWhich); |