Размеры для копирования в HTML берутся из ParaDrawing.Extent

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

Common/wordcopypaste.js

@@ -701,8 +701,8 @@ CopyProcessor.prototype =
                 {
                     sSrc = this.getSrc(sSrc);
 
-                    var _w = ParaItem.GraphicObj.bounds.w;
-                    var _h = ParaItem.GraphicObj.bounds.h;
+                    var _w = ParaItem.Extent.W;
+                    var _h = ParaItem.Extent.H;
 
                     sRes += "<img style=\"max-width:100%;\" width=\""+Math.round(_w * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(_h * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
                     break;

Excel/model/clipboard.js

@@ -5018,7 +5018,7 @@
 						if(sSrc.length > 0)
 						{
 							sSrc = this.getSrc(sSrc);
-							sRes += "<img style=\"max-width:100%;\" width=\""+Math.round(ParaItem.GraphicObj.bounds.w * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(ParaItem.GraphicObj.bounds.h * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
+							sRes += "<img style=\"max-width:100%;\" width=\""+Math.round(ParaItem.Extent.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(ParaItem.Extent.H * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
 							break;
 						}
 						// var _canvas     = document.createElement('canvas');
@@ -5455,7 +5455,7 @@
 									var base64_img = cur_element.getBase64Img();
 									var src = this.getSrc(base64_img);
 
-									this.Para.innerHTML = "<img style=\"max-width:100%;\" width=\""+Math.round(cur_element.GraphicObj.bounds.w * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(cur_element.GraphicObj.bounds.h * g_dKoef_mm_to_pix)+"\" src=\""+src+"\" />";
+									this.Para.innerHTML = "<img style=\"max-width:100%;\" width=\""+Math.round(cur_element.Extent.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(cur_element.Extent.H * g_dKoef_mm_to_pix)+"\" src=\""+src+"\" />";
 
 									this.ElemToSelect.appendChild( this.Para );