diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvs2.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index baac52ee46e1..4e6d10ede19d 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -988,11 +988,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() || GetDocSh()->IsUIActive() ) { - rSet.DisableItem( SID_ZOOM_IN ); + rSet.DisableItem( SID_ZOOM_OUT ); rSet.DisableItem( SID_ZOOM_PANNING ); } if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() ) - rSet.DisableItem( SID_ZOOM_OUT ); + rSet.DisableItem( SID_ZOOM_IN ); } if (!mpZoomList->IsNextPossible()) diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index db9662bb7650..03a033585883 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1176,7 +1176,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } break; - case SID_ZOOM_IN: // BASIC + case SID_ZOOM_OUT: // BASIC { mbZoomOnPage = false; SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) ); @@ -1190,7 +1190,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } break; - case SID_ZOOM_OUT: + case SID_ZOOM_IN: { mbZoomOnPage = false; SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) ); @@ -1198,6 +1198,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) GetActiveWindow()->GetOutputSizePixel()) ); mpZoomList->InsertZoomRect(aVisAreaWin); Invalidate( SID_ZOOM_IN ); + Invalidate(SID_ZOOM_OUT); Invalidate( SID_ZOOM_PANNING ); rReq.Done (); } diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 4acabdf2dbf7..94e1d90e8656 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -125,7 +125,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) break; } - case SID_ZOOM_OUT: + case SID_ZOOM_IN: { SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) ); ::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0), @@ -133,6 +133,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) mpZoomList->InsertZoomRect(aVisAreaWin); Invalidate( SID_ATTR_ZOOM ); Invalidate( SID_ZOOM_IN ); + Invalidate(SID_ZOOM_OUT); Invalidate( SID_ATTR_ZOOMSLIDER ); Cancel(); rReq.Done(); @@ -152,7 +153,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) } break; - case SID_ZOOM_IN: + case SID_ZOOM_OUT: { SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) ); ::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0), diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index ce1cb0ceeee3..7bd920d931fc 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -736,9 +736,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) SfxItemState::DEFAULT == rSet.GetItemState( SID_ZOOM_OUT ) ) { if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() || GetDocSh()->IsUIActive() ) - rSet.DisableItem( SID_ZOOM_IN ); - if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() ) rSet.DisableItem( SID_ZOOM_OUT ); + if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() ) + rSet.DisableItem( SID_ZOOM_IN ); } ::Outliner& rOutl = pOlView->GetOutliner(); |