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

PowerPoint/Drawing/Transitions.js

@@ -2617,6 +2617,11 @@ function CDemonstrationManager(htmlpage)
             _ctx2.clearRect(oThis.Transition.Rect.x, oThis.Transition.Rect.y, oThis.Transition.Rect.w, oThis.Transition.Rect.r);
         }
 
+        if (null == this.SlideImage)
+        {
+
+        }
+
         var _ctx1 = oThis.Canvas.getContext('2d');
         oThis.Transition.CalculateRectDemonstration();
         _ctx1.drawImage(oThis.SlideImage, oThis.Transition.Rect.x, oThis.Transition.Rect.y, oThis.Transition.Rect.w, oThis.Transition.Rect.r);
@@ -2625,9 +2630,12 @@ function CDemonstrationManager(htmlpage)
 
         var _slides = oThis.HtmlPage.m_oLogicDocument.Slides;
         var _timing = _slides[oThis.SlideNum].timing;
-        this.CheckSlideDuration = setTimeout(function(){
-            oThis.StartSlide(true, false);
-        }, _timing.SlideAdvanceDuration);
+        this.CheckSlideDuration = setTimeout(function()
+        {
+            if (oThis.IsPlayMode)
+                oThis.StartSlide(true, false);
+        },
+        _timing.SlideAdvanceDuration);
     }
 
     this.End = function()

PowerPoint/Editor/Format.js

@@ -3694,6 +3694,7 @@ function Slide(presentation, slideLayout, slideNum)
     this.showMasterPhAnim = false;
 
     this.timing = new CAscSlideTiming();
+    this.timing.setDefaultParams();
 
     this.presentation = presentation;
     // pointers

PowerPoint/Editor/Presentation.js

@@ -325,6 +325,7 @@ function CPresentation( DrawingDocument ) {
     this.globalTableStyles = [];
     ///this.globalTableStyles[0] = CreateDefaultStylesForTables();
     this.DefaultSlideTiming = new CAscSlideTiming();
+    this.DefaultSlideTiming.setDefaultParams();
 
     this.IsExternalFonts = false;
     this.createDefaultTableStyles();

PowerPoint/apiCommon.js

@@ -81,13 +81,13 @@ CAscColorScheme.prototype.get_name = function() { return this.Name; }
 
 function CAscSlideTiming()
 {
-    this.TransitionType     = c_oAscSlideTransitionTypes.None;
-    this.TransitionOption   = -1;
-    this.TransitionDuration = 2000;
+    this.TransitionType     = undefined;
+    this.TransitionOption   = undefined;
+    this.TransitionDuration = undefined;
 
-    this.SlideAdvanceOnMouseClick   = true;
-    this.SlideAdvanceAfter          = false;
-    this.SlideAdvanceDuration       = 10000;
+    this.SlideAdvanceOnMouseClick   = undefined;
+    this.SlideAdvanceAfter          = undefined;
+    this.SlideAdvanceDuration       = undefined;
 }
 
 CAscSlideTiming.prototype.put_TransitionType = function(v) { this.TransitionType = v; }
@@ -161,6 +161,17 @@ CAscSlideTiming.prototype.setUndefinedOptions = function()
     this.SlideAdvanceDuration       = undefined;
 }
 
+CAscSlideTiming.prototype.setDefaultParams = function()
+{
+    this.TransitionType     = c_oAscSlideTransitionTypes.None;
+    this.TransitionOption   = -1;
+    this.TransitionDuration = 2000;
+
+    this.SlideAdvanceOnMouseClick   = true;
+    this.SlideAdvanceAfter          = false;
+    this.SlideAdvanceDuration       = 10000;
+}
+
 // ---------------------------------------------------------------
 
 function CAscTexture()