git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50428 954022d7-b5bf-4e40-9824-e11837661b57

PowerPoint/Editor/Format/GraphicFrame.js

@@ -2157,6 +2157,8 @@ CGraphicFrame.prototype =
 
     Undo: function(data)
     {
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
 
@@ -2281,7 +2283,8 @@ CGraphicFrame.prototype =
 
     Redo: function(data)
     {
-
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
 

PowerPoint/Editor/Format/GroupShape.js

@@ -1440,6 +1440,8 @@ CGroupShape.prototype =
 
     Undo: function(data)
     {
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_AutoShapes_SwapGraphicObjects:
@@ -1533,7 +1535,8 @@ CGroupShape.prototype =
 
     Redo: function(data)
     {
-
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_AutoShapes_SwapGraphicObjects:

PowerPoint/Editor/Format/Image.js

@@ -1122,6 +1122,8 @@ CImageShape.prototype =
 
     Undo: function(data)
     {
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_SetShapeSetGeometry:
@@ -1217,7 +1219,8 @@ CImageShape.prototype =
 
     Redo: function(data)
     {
-
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_SetShapeSetGeometry:

PowerPoint/Editor/Format/Layout.js

@@ -585,6 +585,7 @@ SlideLayout.prototype =
 
     Undo: function(data)
     {
+        return;
         switch(data.Type)
         {
             case historyitem_SetLayoutMaster:
@@ -702,6 +703,7 @@ SlideLayout.prototype =
 
     Redo: function(data)
     {
+        return;
         switch(data.Type)
         {
             case historyitem_SetLayoutMaster:

PowerPoint/Editor/Format/Presentation.js

@@ -367,6 +367,7 @@ function CPresentation(DrawingDocument)
 
     this.CommentAuthors = {};
     this.createDefaultTableStyles();
+    this.bGoToPage = false;
 }
 
 var selected_None              = -1;
@@ -722,6 +723,14 @@ CPresentation.prototype =
 
             //this.Set_CurPage(this.Slides.length - 1);
         }
+        else
+        {
+            if(this.bGoToPage)
+            {
+                this.DrawingDocument.m_oWordControl.GoToPage(this.CurPage);
+                this.bGoToPage = false;
+            }
+        }
         if(this.Slides[this.CurPage])
             this.Slides[this.CurPage].graphicObjects.updateSelectionState();
     },
@@ -5288,6 +5297,8 @@ CPresentation.prototype =
         //this.DrawingDocument.m_oWordControl.GoToPage(State.CurPage);
         if(State.CurPage > -1)
             this.Slides[this.CurPage].graphicObjects.setSelectionState(State.slideSelection);
+
+        this.bGoToPage = true;
         return ;
         if ( docpostype_DrawingObjects === this.CurPos.Type )
             this.DrawingObjects.resetSelection();

PowerPoint/Editor/Format/Shape.js

@@ -3722,6 +3722,8 @@ CShape.prototype =
 
     Undo: function(data)
     {
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_SetShapeRot:
@@ -3853,7 +3855,8 @@ CShape.prototype =
 
     Redo: function(data)
     {
-
+        if(this.parent instanceof MasterSlide || this.parent instanceof SlideLayout)
+            return;
         switch(data.Type)
         {
             case historyitem_SetShapeRot: