charspace save; retina transitions bugs;trunsition bugs

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

Common/Shapes/SerializeWriter.js

@@ -1765,6 +1765,11 @@ function CBinaryFileWriter()
         else if (rPr.DStrikeout === false && rPr.Strikeout === false)
             _strike = 1;
 
+        if (undefined !== rPr.Spacing && null != rPr.Spacing)
+        {
+            oThis._WriteInt1(15, (rPr.Spacing * 7200 / 25.4) >> 0);
+        }
+
         if (null != _strike)
         {
             oThis._WriteUChar1(16, _strike);

PowerPoint/Drawing/DrawingDocument.js

@@ -2096,7 +2096,7 @@ function CDrawingDocument()
     }
     this.DrawTarget = function()
     {
-        if ( "block" != oThis.TargetHtmlElement.style.display && oThis.NeedTarget )
+        if ( "block" != oThis.TargetHtmlElement.style.display && oThis.NeedTarget && !oThis.TransitionSlide.IsPlaying())
             oThis.TargetHtmlElement.style.display = "block";
         else
             oThis.TargetHtmlElement.style.display = "none";

PowerPoint/Drawing/HtmlPage.js

@@ -1474,6 +1474,9 @@ function CEditorPage(api)
 
         var oWordControl = oThis;
 
+        if (oWordControl.m_oDrawingDocument.TransitionSlide.IsPlaying())
+            oWordControl.m_oDrawingDocument.TransitionSlide.End(true);
+
         if (!oThis.m_bIsIE)
         {
             if (e.preventDefault)
@@ -1794,6 +1797,9 @@ function CEditorPage(api)
                 return;
         }
 
+        if (oWordControl.m_oDrawingDocument.TransitionSlide.IsPlaying())
+            oWordControl.m_oDrawingDocument.TransitionSlide.End(true);
+
         if (oThis.TextBoxInputMode)
         {
             oThis.onKeyDownTBIM(e);

PowerPoint/Drawing/Transitions.js

@@ -292,7 +292,10 @@ function CTransitionAnimation(htmlpage)
                 break;
             }
             default:
+            {
+                this.End(true);
                 break;
+            }
         }
     }
 
@@ -2953,6 +2956,9 @@ function CDemonstrationManager(htmlpage)
         this.DemonstrationDiv = null;
         this.Mode = false;
 
+        var ctx1 = this.HtmlPage.m_oEditor.HtmlElement.getContext('2d');
+        ctx1.setTransform(1, 0, 0, 1, 0, 0);
+
         this.HtmlPage.m_oApi.sync_endDemonstration();
     }