endDEmonstration

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

PowerPoint/Drawing/Transitions.js

@@ -3047,10 +3047,13 @@ function CDemonstrationManager(htmlpage)
         }
     }
 
-    this.End = function()
+    this.End = function(isNoUseFullScreen)
     {
-        if (undefined !== window["AscDesktopEditor"])
-            window["AscDesktopEditor"]["SetFullscreen"](false);
+		if (true !== isNoUseFullScreen)
+		{
+			if (undefined !== window["AscDesktopEditor"])
+				window["AscDesktopEditor"]["SetFullscreen"](false);
+		}
 
         if (!this.Mode)
             return;

PowerPoint/Local/api.js

@@ -206,5 +206,5 @@ window["on_editor_native_message"] = function(sCommand, sParam)
 	else if (sCommand == "print")
 		editor.asc_Print();
 	else if (sCommand == "editor:stopDemonstration")
-		editor.EndDemonstration();
+		editor.EndDemonstration(true);
 };

PowerPoint/api.js

@@ -4477,9 +4477,9 @@ asc_docs_api.prototype.StartDemonstration = function(div_id, slidestart_num)
     this.WordControl.DemonstrationManager.Start(div_id, slidestart_num, true);
 };
 
-asc_docs_api.prototype.EndDemonstration = function()
+asc_docs_api.prototype.EndDemonstration = function(isNoUseFullScreen)
 {
-    this.WordControl.DemonstrationManager.End();
+    this.WordControl.DemonstrationManager.End(isNoUseFullScreen);
 };
 
 asc_docs_api.prototype.DemonstrationPlay = function()