Bug 27597 - Изображение, вставленное в колонтитул, не отображается, если оно...

Bug 27597 - Изображение, вставленное в колонтитул, не отображается, если оно больше размера колонтитула

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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -712,34 +712,37 @@ CGraphicObjects.prototype =
         for(i = 0; i < drawings.length; ++i)
         {
             var array_type = drawings[i].getDrawingArrayType();
-            var drawing_array = null;
-            switch(array_type)
+            if(drawings[i].PageNum === pageIndex)
             {
-                case DRAWING_ARRAY_TYPE_INLINE:
+                var drawing_array = null;
+                switch(array_type)
                 {
-                    drawing_array = hdr_ftr_page.inlineObjects;
-                    break;
-                }
-                case DRAWING_ARRAY_TYPE_BEHIND:
-                {
-                    drawing_array  = hdr_ftr_page.behindDocObjects;
-                    break;
-                }
-                case DRAWING_ARRAY_TYPE_BEFORE:
-                {
-                    drawing_array = hdr_ftr_page.beforeTextObjects;
-                    break;
+                    case DRAWING_ARRAY_TYPE_INLINE:
+                    {
+                        drawing_array = hdr_ftr_page.inlineObjects;
+                        break;
+                    }
+                    case DRAWING_ARRAY_TYPE_BEHIND:
+                    {
+                        drawing_array  = hdr_ftr_page.behindDocObjects;
+                        break;
+                    }
+                    case DRAWING_ARRAY_TYPE_BEFORE:
+                    {
+                        drawing_array = hdr_ftr_page.beforeTextObjects;
+                        break;
+                    }
+                    case DRAWING_ARRAY_TYPE_WRAPPING:
+                    {
+                        drawing_array = hdr_ftr_page.wrappingObjects;
+                        break;
+                    }
                 }
-                case DRAWING_ARRAY_TYPE_WRAPPING:
+                if(Array.isArray(drawing_array))
                 {
-                    drawing_array = hdr_ftr_page.wrappingObjects;
-                    break;
+                    drawing_array.push(drawings[i].GraphicObj);
                 }
             }
-            if(Array.isArray(drawing_array))
-            {
-                drawing_array.push(drawings[i].GraphicObj);
-            }
         }
         for(i = 0; i < tables.length; ++i)
         {
@@ -2380,8 +2383,19 @@ CGraphicObjects.prototype =
     selectById: function(id, pageIndex)
     {
         this.resetSelection();
-        var object = g_oTableId.Get_ById(id);
-        object.GraphicObj.select(this, pageIndex);
+        var obj = g_oTableId.Get_ById(id), nPageIndex = pageIndex;
+        if(obj && obj.GraphicObj)
+        {
+            if(obj.DocumentContent && obj.DocumentContent.Is_HdrFtr())
+            {
+                if(obj.DocumentContent.Get_StartPage_Absolute() !== obj.PageNum)
+                {
+                    nPageIndex = obj.PageNum;
+                }
+            }
+            obj.GraphicObj.select(this, nPageIndex);
+        }
+
     },
 
     calculateAfterChangeTheme: function()

Word/Editor/ParagraphContent.js

@@ -4489,7 +4489,10 @@ ParaDrawing.prototype =
         var _x = (this.PositionH.Align || bInline) ? x - this.GraphicObj.bounds.x : x;
         var _y = (this.PositionV.Align || bInline) ? y - this.GraphicObj.bounds.y : y;
 
-        this.graphicObjects.addObjectOnPage(pageIndex, this.GraphicObj);
+        if(!(this.DocumentContent && this.DocumentContent.Is_HdrFtr() && this.DocumentContent.Get_StartPage_Absolute() !== pageIndex))
+        {
+            this.graphicObjects.addObjectOnPage(pageIndex, this.GraphicObj);
+        }
         this.selectX = x;
         this.selectY = y;