Kaydet (Commit) a4450fe6 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

Related: fdo#83572 Try to fix zoom mode button state

Change-Id: I4e146788c3ab83f714bfb0aef1da018b038be64d
üst acd78552
...@@ -629,12 +629,12 @@ interface DrawView ...@@ -629,12 +629,12 @@ interface DrawView
] ]
SID_ZOOM_MODE // ole : no, status : play rec SID_ZOOM_MODE // ole : no, status : play rec
[ [
ExecMethod = FuTemporary ; ExecMethod = FuPermanent ;
StateMethod = GetMenuState ; StateMethod = GetMenuState ;
] ]
SID_ZOOM_PANNING // ole : no, status : play rec SID_ZOOM_PANNING // ole : no, status : play rec
[ [
ExecMethod = FuTemporary ; ExecMethod = FuPermanent ;
StateMethod = GetMenuState ; StateMethod = GetMenuState ;
] ]
SID_ZOOM_IN // ole : no, status : play rec SID_ZOOM_IN // ole : no, status : play rec
......
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
#include "futxtatt.hxx" #include "futxtatt.hxx"
#include "fuvect.hxx" #include "fuvect.hxx"
#include "futext.hxx" #include "futext.hxx"
#include "fuzoom.hxx"
#include "helpids.h" #include "helpids.h"
#include "optsitem.hxx" #include "optsitem.hxx"
#include "sdabstdlg.hxx" #include "sdabstdlg.hxx"
...@@ -1222,16 +1221,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ...@@ -1222,16 +1221,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
} }
break; 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_BEFORE_OBJ:
case SID_BEHIND_OBJ: case SID_BEHIND_OBJ:
{ {
......
...@@ -289,7 +289,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) ...@@ -289,7 +289,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
// map images of the toolboxes // map images of the toolboxes
UpdateToolboxImages( rSet ); UpdateToolboxImages( rSet );
if( nId != SID_ZOOM_TOOLBOX && if( nSId != SID_ZOOM_TOOLBOX &&
nSId != SID_DRAWTBX_INSERT && nSId != SID_DRAWTBX_INSERT &&
nSId != SID_POSITION && nSId != SID_POSITION &&
nSId != SID_OBJECT_ALIGN ) nSId != SID_OBJECT_ALIGN )
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
#include "optsitem.hxx" #include "optsitem.hxx"
#include "Window.hxx" #include "Window.hxx"
#include "fuformatpaintbrush.hxx" #include "fuformatpaintbrush.hxx"
#include "fuzoom.hxx"
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -533,6 +534,15 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) ...@@ -533,6 +534,15 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
break; break;
} }
case SID_ZOOM_MODE:
case SID_ZOOM_PANNING:
{
mbZoomOnPage = false;
SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
rReq.Done();
}
break;
default: default:
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment