[Libreoffice-commits] core.git: sd/sdi sd/source

[Maxim Monastirsky]

 sd/sdi/_drvwsh.sdi             |    4 ++--
 sd/source/ui/view/drviews2.cxx |   11 -----------
 sd/source/ui/view/drviews7.cxx |    2 +-
 sd/source/ui/view/drviewse.cxx |   10 ++++++++++
 4 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit a4450fe6d06a138c1f3b1c43546a7246be8a26c5
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Nov 17 10:24:30 2014 +0200

    Related: fdo#83572 Try to fix zoom mode button state
    
    Change-Id: I4e146788c3ab83f714bfb0aef1da018b038be64d

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 2166470..38953ca 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 c85eb2c..c8b6c07 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 4bb781f..37e8a31 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 100d1f8..9536739 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;
     }