поправлен баг 18967 - Нет возможности выбрать объект на пересечении Inline и...

поправлен баг 18967 - Нет возможности выбрать объект на пересечении Inline и Behind изображений/диаграмм

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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -4371,7 +4371,7 @@ CGraphicObjects.prototype =
             }
 
 
-            cur_page_array = this.graphicPages[pageIndex].wrappingObjects;
+            cur_page_array = this.graphicPages[pageIndex].inlineObjects;
             for(index = 0; index < cur_page_array.length; ++index)
             {
                 if(!cur_page_array[index].isShapeChild())
@@ -4381,12 +4381,12 @@ CGraphicObjects.prototype =
                         b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y).hit;
                     else
                         b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y);
-                    if(cur_page_array[index].hit(x, y) || b_hit_to_text_rect)
-                        return DRAWING_ARRAY_TYPE_WRAPPING;
+                    if( (cur_page_array[index].hit(x, y) || b_hit_to_text_rect))
+                        return DRAWING_ARRAY_TYPE_INLINE;
                 }
             }
 
-            cur_page_array = this.graphicPages[pageIndex].behindDocObjects;
+            cur_page_array = this.graphicPages[pageIndex].wrappingObjects;
             for(index = 0; index < cur_page_array.length; ++index)
             {
                 if(!cur_page_array[index].isShapeChild())
@@ -4396,12 +4396,14 @@ CGraphicObjects.prototype =
                         b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y).hit;
                     else
                         b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y);
-                    if( (cur_page_array[index].hit(x, y) || b_hit_to_text_rect))
-                        return DRAWING_ARRAY_TYPE_BEHIND;
+                    if(cur_page_array[index].hit(x, y) || b_hit_to_text_rect)
+                        return DRAWING_ARRAY_TYPE_WRAPPING;
                 }
             }
 
-            cur_page_array = this.graphicPages[pageIndex].inlineObjects;
+
+
+            cur_page_array = this.graphicPages[pageIndex].behindDocObjects;
             for(index = 0; index < cur_page_array.length; ++index)
             {
                 if(!cur_page_array[index].isShapeChild())
@@ -4412,9 +4414,11 @@ CGraphicObjects.prototype =
                     else
                         b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y);
                     if( (cur_page_array[index].hit(x, y) || b_hit_to_text_rect))
-                        return DRAWING_ARRAY_TYPE_INLINE;
+                        return DRAWING_ARRAY_TYPE_BEHIND;
                 }
             }
+
+
         }
         else
         {
@@ -4474,9 +4478,7 @@ CGraphicObjects.prototype =
                 }
 
 
-
-
-                cur_page_array = hdr_footer_objects.wrappingArray;
+                cur_page_array = hdr_footer_objects.inlineArray;
                 for(index = 0; index < cur_page_array.length; ++index)
                 {
                     if(!cur_page_array[index].isShapeChild())
@@ -4487,12 +4489,11 @@ CGraphicObjects.prototype =
                             b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y);
 
                         if(/*cur_page_array[index].Parent.Parent === documentContent &&*/ (cur_page_array[index].hit(x, y) || b_hit_to_text_rect))
-                            return DRAWING_ARRAY_TYPE_WRAPPING;
+                            return DRAWING_ARRAY_TYPE_INLINE;
                     }
                 }
 
-                cur_page_array = hdr_footer_objects.inlineArray;
-
+                cur_page_array = hdr_footer_objects.wrappingArray;
                 for(index = 0; index < cur_page_array.length; ++index)
                 {
                     if(!cur_page_array[index].isShapeChild())
@@ -4503,12 +4504,13 @@ CGraphicObjects.prototype =
                             b_hit_to_text_rect = cur_page_array[index].hitToTextRect(x, y);
 
                         if(/*cur_page_array[index].Parent.Parent === documentContent &&*/ (cur_page_array[index].hit(x, y) || b_hit_to_text_rect))
-                            return DRAWING_ARRAY_TYPE_INLINE;
+                            return DRAWING_ARRAY_TYPE_WRAPPING;
                     }
                 }
 
-                cur_page_array = hdr_footer_objects.behindDocArray;
 
+
+                cur_page_array = hdr_footer_objects.behindDocArray;
                 for(index = 0; index < cur_page_array.length; ++index)
                 {
                     if(!cur_page_array[index].isShapeChild())