fix Bug 33110

word/Editor/DocumentContent.js

@@ -1233,6 +1233,10 @@ CDocumentContent.prototype.Draw                           = function(nPageIndex,
         pGraphics.AddClipRect(ClipInfo.X0, Bounds.Top - Correction, Math.abs(ClipInfo.X1 - ClipInfo.X0), Bounds.Bottom - Bounds.Top + Correction);
     }
 
+
+    if (this.LogicDocument)
+        this.LogicDocument.DrawingObjects.drawWrappingObjectsInContent(this.Get_AbsolutePage(CurPage), pGraphics, this);
+
     var Page_StartPos = this.Pages[CurPage].Pos;
     var Page_EndPos   = this.Pages[CurPage].EndPos;
     for (var Index = Page_StartPos; Index <= Page_EndPos; Index++)
@@ -1241,8 +1245,6 @@ CDocumentContent.prototype.Draw                           = function(nPageIndex,
         this.Content[Index].Draw(ElementPageIndex, pGraphics);
     }
 
-    if (this.LogicDocument)
-        this.LogicDocument.DrawingObjects.drawWrappingObjectsInContent(this.Get_AbsolutePage(CurPage), pGraphics, this);
 
     if (ClipInfo)
     {

word/Editor/GraphicObjects/Format/GroupPrototype.js

@@ -372,15 +372,15 @@ CGroupShape.prototype.recalculateBounds = function()
     for(var i = 0; i < sp_tree.length; ++i)
     {
         sp_tree[i].recalculate();
-        //var bounds = sp_tree[i].bounds;
-        //var l = bounds.l;
-        //var r = bounds.r;
-        //var t = bounds.t;
-        //var b = bounds.b;
-        //x_arr_max.push(r);
-        //x_arr_min.push(l);
-        //y_arr_max.push(b);
-        //y_arr_min.push(t);
+        var bounds = sp_tree[i].bounds;
+        var l = bounds.l;
+        var r = bounds.r;
+        var t = bounds.t;
+        var b = bounds.b;
+        x_arr_max.push(r);
+        x_arr_min.push(l);
+        y_arr_max.push(b);
+        y_arr_min.push(t);
     }
 
 

word/Editor/Paragraph/ParaDrawing.js

@@ -683,12 +683,10 @@ ParaDrawing.prototype.getXfrmExtY = function()
 };
 ParaDrawing.prototype.Get_Bounds = function()
 {
-	return {
-		Left   : this.X,
-		Top    : this.Y,
-		Bottom : this.Y + this.getXfrmExtY(),
-		Right  : this.X + this.getXfrmExtX()
-	};
+    var W, H;
+    W = this.GraphicObj.bounds.w;
+    H = this.GraphicObj.bounds.h;
+    return {Left : this.X, Top : this.Y, Bottom : this.Y + H, Right : this.X + W};
 };
 ParaDrawing.prototype.Search = function(Str, Props, SearchEngine, Type)
 {