пустая презентация, мелкие баги

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

PowerPoint/Drawing/DrawingDocument.js

@@ -2599,15 +2599,30 @@ function CDrawingDocument()
 
     this.CheckGuiControlColors = function(bIsAttack)
     {
+        var _slide = null;
+        var _layout = null;
+        var _master = null;
+
         // потом реализовать проверку на то, что нужно ли посылать
-        if (-1 == this.SlideCurrent)
+        if (-1 != this.SlideCurrent)
+        {
+            _slide = this.m_oWordControl.m_oLogicDocument.Slides[this.SlideCurrent];
+            _layout = _slide.Layout;
+            _master = _layout.Master;
+        }
+        else if ((0 < this.m_oWordControl.m_oLogicDocument.slideMasters.length) &&
+                 (0 < this.m_oWordControl.m_oLogicDocument.slideMasters[0].sldLayoutLst.length))
+        {
+            _layout = this.m_oWordControl.m_oLogicDocument.slideMasters[0].sldLayoutLst[0];
+            _master = this.m_oWordControl.m_oLogicDocument.slideMasters[0];
+        }
+        else
+        {
             return;
+        }
 
         var arr_colors = new Array(10);
 
-        var _slide = this.m_oWordControl.m_oLogicDocument.Slides[this.SlideCurrent];
-        var _layout = _slide.Layout;
-        var _master = _layout.Master;
         var _theme = _master.Theme;
         var rgba = {R:0, G:0, B:0, A:255};
         // bg1,tx1,bg2,tx2,accent1 - accent6
@@ -4646,7 +4661,7 @@ function CThumbnailsManager()
 						_presentation.Recalculate();
 						_presentation.Document_UpdateInterfaceState();
 					}
-					return false;
+					//return false;
                 }
                 else if(global_keyboardEvent.CtrlKey)
                 {
@@ -4699,6 +4714,13 @@ function CThumbnailsManager()
                         this.m_oWordControl.GoToPage(drDoc.SlideCurrent + 1);
                     }
                 }
+                else if (global_keyboardEvent.CtrlKey)
+                {
+                    if (drDoc.SlidesCount > 0)
+                    {
+                        this.m_oWordControl.GoToPage(drDoc.SlidesCount - 1);
+                    }
+                }
                 else
                 {
                     this.CorrectShiftSelect(false, false);
@@ -4884,7 +4906,7 @@ function CThumbnailsManager()
 						_presentation.Recalculate();
 						_presentation.Document_UpdateInterfaceState();
 					}
-                    return false;
+                    //return false;
                 }
                 else if(global_keyboardEvent.CtrlKey)
                 {
@@ -4937,6 +4959,13 @@ function CThumbnailsManager()
                         this.m_oWordControl.GoToPage(drDoc.SlideCurrent - 1);
                     }
                 }
+                else if (global_keyboardEvent.CtrlKey)
+                {
+                    if (drDoc.SlidesCount > 0)
+                    {
+                        this.m_oWordControl.GoToPage(0);
+                    }
+                }
                 else
                 {
                     this.CorrectShiftSelect(true, false);

PowerPoint/Drawing/HtmlPage.js

@@ -3207,10 +3207,15 @@ function CEditorPage(api)
 
     this.CheckLayouts = function(bIsAttack)
     {
-        if (-1 == this.m_oDrawingDocument.SlideCurrent)
+        var master = null;
+        if (-1 == this.m_oDrawingDocument.SlideCurrent && 0 == this.m_oLogicDocument.slideMasters.length)
             return;
 
-        var master = this.m_oLogicDocument.Slides[this.m_oDrawingDocument.SlideCurrent].Layout.Master;
+        if (-1 != this.m_oDrawingDocument.SlideCurrent)
+            master = this.m_oLogicDocument.Slides[this.m_oDrawingDocument.SlideCurrent].Layout.Master;
+        else
+            master = this.m_oLogicDocument.slideMasters[0];
+
         if (this.MasterLayouts != master || Math.abs(this.m_oLayoutDrawer.WidthMM - this.m_oLogicDocument.Width) > MOVE_DELTA || Math.abs(this.m_oLayoutDrawer.HeightMM - this.m_oLogicDocument.Height) > MOVE_DELTA || bIsAttack === true)
         {
             this.MasterLayouts = master;

Word/Drawing/WorkEvents.js

@@ -216,6 +216,10 @@ function check_MouseUpEvent(e)
     global_mouseEvent.ShiftKey = e.shiftKey;
     global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
 
+    global_keyboardEvent.AltKey     = global_mouseEvent.AltKey;
+    global_keyboardEvent.CtrlKey    = global_mouseEvent.ShiftKey;
+    global_keyboardEvent.ShiftKey   = global_mouseEvent.CtrlKey;
+
     global_mouseEvent.Type = g_mouse_event_type_up;
     global_mouseEvent.Button = e.button;
 
@@ -262,6 +266,10 @@ function check_MouseDownEvent(e, isClicks)
     global_mouseEvent.ShiftKey = e.shiftKey;
     global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
 
+    global_keyboardEvent.AltKey     = global_mouseEvent.AltKey;
+    global_keyboardEvent.CtrlKey    = global_mouseEvent.ShiftKey;
+    global_keyboardEvent.ShiftKey   = global_mouseEvent.CtrlKey;
+
     global_mouseEvent.Type = g_mouse_event_type_down;
     global_mouseEvent.Button = e.button;