diff options
| -rw-r--r-- | sd/sdi/_drvwsh.sdi | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 10 |
4 files changed, 13 insertions, 14 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 216647073923..38953ca2b1fc 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -629,12 +629,12 @@ interface DrawView ] SID_ZOOM_MODE // ole : no, status : play rec [ - ExecMethod = FuTemporary ; + ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] SID_ZOOM_PANNING // ole : no, status : play rec [ - ExecMethod = FuTemporary ; + ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] SID_ZOOM_IN // ole : no, status : play rec diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index c85eb2cf3a29..c8b6c07f498e 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -156,7 +156,6 @@ #include "futxtatt.hxx" #include "fuvect.hxx" #include "futext.hxx" -#include "fuzoom.hxx" #include "helpids.h" #include "optsitem.hxx" #include "sdabstdlg.hxx" @@ -1222,16 +1221,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_ZOOM_MODE: - case SID_ZOOM_PANNING: - { - mbZoomOnPage = false; - SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) ); - Invalidate( SID_ZOOM_TOOLBOX ); - rReq.Ignore (); - } - break; - case SID_BEFORE_OBJ: case SID_BEHIND_OBJ: { diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 4bb781fff1e6..37e8a31d668d 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -289,7 +289,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // map images of the toolboxes UpdateToolboxImages( rSet ); - if( nId != SID_ZOOM_TOOLBOX && + if( nSId != SID_ZOOM_TOOLBOX && nSId != SID_DRAWTBX_INSERT && nSId != SID_POSITION && nSId != SID_OBJECT_ALIGN ) diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 100d1f82a475..95367394f289 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -94,6 +94,7 @@ #include "optsitem.hxx" #include "Window.hxx" #include "fuformatpaintbrush.hxx" +#include "fuzoom.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -533,6 +534,15 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) break; } + case SID_ZOOM_MODE: + case SID_ZOOM_PANNING: + { + mbZoomOnPage = false; + SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); + rReq.Done(); + } + break; + default: break; } |