добавил функцию для отрисовки врапнутых объектов привязанных к конкретному контенту

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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -1440,8 +1440,12 @@ CGraphicObjects.prototype =
     },
 
     getHdrFtrObjectsByPageIndex: function(pageIndex)
+    {
+        if(this.graphicPages[pageIndex])
         {
             return this.graphicPages[pageIndex].hdrFtrPage;
+        }
+        return null;
     },
 
     getNearestPos: function(x, y, pageIndex, drawing)
@@ -1538,6 +1542,21 @@ CGraphicObjects.prototype =
         graphics.shapePageIndex = null;
     },
 
+    drawWrappingObjectsInContent: function(pageIndex, graphics, content)
+    {
+        var page;
+        if(content.Is_HdrFtr())
+        {
+            page = this.getHdrFtrObjectsByPageIndex(pageIndex);
+        }
+        else
+        {
+            page = this.graphicPages[pageIndex];
+        }
+        page && page.drawWrappingObjectsByContent(graphics, content)
+    },
+
+
     drawBeforeObjects: function(pageIndex, graphics)
     {
         graphics.shapePageIndex = pageIndex;

Word/Editor/GraphicObjects/GraphicPage.js

@@ -444,9 +444,29 @@ CGraphicPage.prototype =
 
     drawWrappingObjects: function(graphics)
     {
+        var drawing;
         for(var _object_index = 0; _object_index < this.wrappingObjects.length; ++_object_index)
-            this.wrappingObjects[_object_index].draw(graphics);
+        {
+            drawing = this.wrappingObjects[_object_index];
+            if(!(drawing.parent && drawing.parent.DocumentContent && drawing.parent.DocumentContent.Is_TableCellContent()))
+            {
+                drawing.draw(graphics);
+            }
+        }
+        graphics.SetIntegerGrid(true);
+    },
 
+    drawWrappingObjectsByContent: function(graphics, content)
+    {
+        var drawing;
+        for(var _object_index = 0; _object_index < this.wrappingObjects.length; ++_object_index)
+        {
+            drawing = this.wrappingObjects[_object_index];
+            if(drawing.parent && drawing.parent.DocumentContent && drawing.parent.DocumentContent === content)
+            {
+                drawing.draw(graphics);
+            }
+        }
         graphics.SetIntegerGrid(true);
     },