конвертация шейпа в картинку

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

Common/wordcopypaste.js

@@ -5603,7 +5603,7 @@ PasteProcessor.prototype =
                             var oDrawingDocument = this.oDocument.DrawingDocument;
                             if(oTargetDocument && oDrawingDocument)
                             {
-								Drawing = CreateImageFromBinary(sSrc, nWidth, nHeight);
+								var Drawing = CreateImageFromBinary(sSrc, nWidth, nHeight);
 								// oTargetDocument.DrawingObjects.Add( Drawing );
 
                                 this._Paragraph_Add( Drawing );

Word/Drawing/Overlay.js

@@ -2630,6 +2630,18 @@ CSlideBoundsChecker.prototype =
         }
     },
 
+	CheckLineWidth : function(shape)
+	{
+		if (!shape)
+			return;
+		var _ln = shape.pen;
+		if (_ln != null || _ln.Fill != null || _ln.Fill.fill != null)
+		{
+			this.LineWidth = (_ln.w == null) ? 12700 : parseInt(_ln.w);
+			this.LineWidth /= 36000.0;
+		}
+	},
+
     DrawLockObjectRect : function()
     {
     },

Word/Drawing/ShapeDrawer.js

@@ -1804,7 +1804,9 @@ function ShapeToImageConverter(shape, pageIndex)
     _bounds_cheker.transform(1,0,0,1,0,0);
 
     _bounds_cheker.AutoCheckLineWidth = true;
+	_bounds_cheker.CheckLineWidth(shape);
     shape.draw(_bounds_cheker, /*pageIndex*/0);
+	_bounds_cheker.CorrectBounds2();
 
     var _need_pix_width     = _bounds_cheker.Bounds.max_x - _bounds_cheker.Bounds.min_x + 1;
     var _need_pix_height    = _bounds_cheker.Bounds.max_y - _bounds_cheker.Bounds.min_y + 1;