отрисовка вертикальных и горизонтальных линий при приснапливании

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

Word/Editor/GraphicObjects/ObjectTypes/Chart.js

@@ -1358,6 +1358,43 @@ CChartAsGroup.prototype =
 
     },
 
+    calculateSnapArrays: function(snapArrayX, snapArrayY)
+    {
+        var t = this.transform;
+        var _t = t;
+        if(isRealObject(this.parent))
+        {
+            if(this.parent.Is_Inline())
+            {
+                if(this.parent.DocumentContent instanceof  CDocumentContent)
+                {
+                    var cur_doc_content = this.parent.DocumentContent;
+                    while(cur_doc_content.Is_TableCellContent())
+                    {
+                        cur_doc_content = cur_doc_content.Parent.Row.Table.Parent;
+
+                    }
+                    if((cur_doc_content instanceof CDocumentContent && cur_doc_content.Parent instanceof WordShape))
+                    {
+                        _t = t.CreateDublicate();
+                        global_MatrixTransformer.MultiplyAppend(_t, cur_doc_content.Parent.transformText);
+                    }
+                }
+            }
+        }
+        snapArrayX.push(_t.TransformPointX(0, 0));
+        snapArrayY.push(_t.TransformPointY(0, 0));
+        snapArrayX.push(_t.TransformPointX(this.absExtX, 0));
+        snapArrayY.push(_t.TransformPointY(this.absExtX, 0));
+
+        snapArrayX.push(t.TransformPointX(this.absExtX*0.5, this.absExtY*0.5));
+        snapArrayY.push(t.TransformPointY(this.absExtX*0.5, this.absExtY*0.5))
+        snapArrayX.push(_t.TransformPointX(this.absExtX, this.absExtY));
+        snapArrayY.push(_t.TransformPointY(this.absExtX, this.absExtY));
+        snapArrayX.push(_t.TransformPointX(0, this.absExtY));
+        snapArrayY.push(_t.TransformPointY(0, this.absExtY));
+    },
+
     hitToHandle: function(x, y, radius)
     {
 

Word/Editor/GraphicObjects/ObjectTypes/Geometry.js

@@ -393,6 +393,8 @@ function CGeometry()
         return duplicate;
     };
 
+
+
     this.createDuplicateForTrack = function()
     {
         var _duplicate = new Geometry();
@@ -479,6 +481,16 @@ CGeometry.prototype=
 
     },
 
+    canFill: function()
+    {
+        for(var i = 0; i < this.pathLst.length; ++i)
+        {
+            if(this.pathLst[i].fill !== "none")
+                return true;
+        }
+        return  false;
+    },
+
     Write_ToBinary2: function(Writer)
     {
         var w = Writer;

Word/Editor/GraphicObjects/ObjectTypes/WordGroupShapes.js

@@ -2147,6 +2147,8 @@ WordGroupShapes.prototype =
         snapArrayX.push(t.TransformPointX(this.absExtX, 0));
         snapArrayY.push(t.TransformPointY(this.absExtX, 0));
 
+        snapArrayX.push(t.TransformPointX(this.absExtX*0.5, this.absExtY*0.5));
+        snapArrayY.push(t.TransformPointY(this.absExtX*0.5, this.absExtY*0.5))
         snapArrayX.push(t.TransformPointX(this.absExtX, this.absExtY));
         snapArrayY.push(t.TransformPointY(this.absExtX, this.absExtY));
         snapArrayX.push(t.TransformPointX(0, this.absExtY));

Word/Editor/GraphicObjects/ObjectTypes/WordImage.js

@@ -795,6 +795,8 @@ WordImage.prototype =
         snapArrayX.push(_t.TransformPointX(this.absExtX, 0));
         snapArrayY.push(_t.TransformPointY(this.absExtX, 0));
 
+        snapArrayX.push(t.TransformPointX(this.absExtX*0.5, this.absExtY*0.5));
+        snapArrayY.push(t.TransformPointY(this.absExtX*0.5, this.absExtY*0.5))
         snapArrayX.push(_t.TransformPointX(this.absExtX, this.absExtY));
         snapArrayY.push(_t.TransformPointY(this.absExtX, this.absExtY));
         snapArrayX.push(_t.TransformPointX(0, this.absExtY));

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -3500,6 +3500,8 @@ WordShape.prototype =
         snapArrayX.push(t.TransformPointX(this.absExtX, 0));
         snapArrayY.push(t.TransformPointY(this.absExtX, 0));
 
+        snapArrayX.push(t.TransformPointX(this.absExtX*0.5, this.absExtY*0.5));
+        snapArrayY.push(t.TransformPointY(this.absExtX*0.5, this.absExtY*0.5))
         snapArrayX.push(t.TransformPointX(this.absExtX, this.absExtY));
         snapArrayY.push(t.TransformPointY(this.absExtX, this.absExtY));
         snapArrayX.push(t.TransformPointX(0, this.absExtY));