поправил падения при открытии

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

PowerPoint/Drawing/HtmlPage.js

@@ -750,10 +750,7 @@ function CEditorPage(api)
         oWordControl.CalculateDocumentSize();
         var lCurPage = oWordControl.m_oDrawingDocument.SlideCurrent;
 
-        if (oWordControl.m_oLogicDocument)
-        {
-            oWordControl.m_oLogicDocument.redrawCharts();
-        }
+
 
         this.GoToPage(lCurPage);
 

PowerPoint/Editor/Format.js

@@ -260,6 +260,23 @@ CColorMod.prototype =
     }
 };
 
+function _create_mod(default_obj)
+{
+	var ret = new CColorMod();
+	ret.name = default_obj["name"];
+	ret.val = default_obj["val"];
+	return ret;
+}
+
+function _create_mods(arr_defaults)
+{
+	var ret = [];
+	for (var i = 0; i < arr_defaults.length; i++)
+		ret.push(_create_mod(arr_defaults[i]));
+	return ret;
+}
+
+
 var cd16 = 1.0/6.0;
 var cd13 = 1.0/3.0;
 var cd23 = 2.0/3.0;

PowerPoint/Editor/Format/CollaborativeEditing.js

@@ -47,8 +47,7 @@ function CTableId()
 
     this.Add = function(Class, Id)
     {
-        if(Class instanceof asc_CChart)// ToDo Его нет!!!!
-            return;
+
         if ( false === this.m_bTurnOff )
         {
             Class.Id = Id;

PowerPoint/Editor/Format/Shape.js

@@ -646,6 +646,9 @@ CShape.prototype =
         }
     },
 
+    setBDeleted: function()
+    {},
+
     Document_UpdateRulersState: function (margins) {
         if (this.txBody && this.txBody.content) {
             this.txBody.content.Document_UpdateRulersState(this.parent.num, this.getMargins());
@@ -1784,6 +1787,14 @@ CShape.prototype =
     },
 
     recalculateTransform: function () {
+        this.recalculateLocalTransform(this.transform);
+        this.invertTransform = global_MatrixTransformer.Invert(this.transform);
+
+    },
+
+
+    recalculateLocalTransform: function(transform)
+    {
         if (!isRealObject(this.group)) {
             if (this.spPr.xfrm.isNotNull()) {
                 var xfrm = this.spPr.xfrm;
@@ -1873,21 +1884,19 @@ CShape.prototype =
             this.flipH = xfrm.flipH === true;
             this.flipV = xfrm.flipV === true;
         }
-        this.transform.Reset();
+        transform.Reset();
         var hc = this.extX * 0.5;
         var vc = this.extY * 0.5;
-        global_MatrixTransformer.TranslateAppend(this.transform, -hc, -vc);
+        global_MatrixTransformer.TranslateAppend(transform, -hc, -vc);
         if (this.flipH)
-            global_MatrixTransformer.ScaleAppend(this.transform, -1, 1);
+            global_MatrixTransformer.ScaleAppend(transform, -1, 1);
         if (this.flipV)
-            global_MatrixTransformer.ScaleAppend(this.transform, 1, -1);
-        global_MatrixTransformer.RotateRadAppend(this.transform, -this.rot);
-        global_MatrixTransformer.TranslateAppend(this.transform, this.x + hc, this.y + vc);
+            global_MatrixTransformer.ScaleAppend(transform, 1, -1);
+        global_MatrixTransformer.RotateRadAppend(transform, -this.rot);
+        global_MatrixTransformer.TranslateAppend(transform, this.x + hc, this.y + vc);
         if (isRealObject(this.group)) {
-            global_MatrixTransformer.MultiplyAppend(this.transform, this.group.getTransformMatrix());
+            global_MatrixTransformer.MultiplyAppend(transform, this.group.getTransformMatrix());
         }
-        this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-
     },
 
     updateInterfaceTextState: function () {

PowerPoint/PowerPoint.html

@@ -131,8 +131,9 @@
 	<script type="text/javascript" src="../../OfficeWeb/PowerPoint/api.js"></script>
 
 	<script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/Format.js"></script>
+	<script type="text/javascript" src="../../OfficeWeb/Common/Drawings/Format/Constants.js"></script>
 	<script type="text/javascript" src="../../OfficeWeb/PowerPoint/themes/Themes.js"></script>
-	<script type="text/javascript" src="../../OfficeWeb/Common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/Serialize.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Common/Shapes/SerializeWriter.js"></script>
     <script src="../../OfficeWeb/Word/Editor/SerializeCommon.js"></script>