git-svn-id:...

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

Common/wordcopypaste.js

@@ -5838,7 +5838,7 @@ PasteProcessor.prototype =
                                 }
                                 else
                                 {
-                                    Drawing = CreateImageFromBinary(sSrc);
+                                    Drawing = CreateImageFromBinary(sSrc, nWidth, nHeight);
                                     // oTargetDocument.DrawingObjects.Add( Drawing );
                                 }
 

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -6959,9 +6959,12 @@ function CreateGraphicObjectFromBinary(bin)
 }
 
 
-function CreateImageFromBinary(bin)
+function CreateImageFromBinary(bin, nW, nH)
 {
     var w, h;
+
+    if (nW === undefined || nH === undefined)
+    {
         var _image = editor.ImageLoader.map_image_index[bin];
         if (_image != undefined && _image.Image != null && _image.Status == ImageLoadStatus.Complete)
         {
@@ -6997,6 +7000,12 @@ function CreateImageFromBinary(bin)
             w = 50;
             h = 50;
         }
+    }
+    else
+    {
+        w = nW;
+        h = nH;
+    }
     var para_drawing = new ParaDrawing(w, h, null, editor.WordControl.m_oLogicDocument.DrawingDocument, editor.WordControl.m_oLogicDocument, null);
     var word_image = new WordImage(para_drawing,  editor.WordControl.m_oLogicDocument, editor.WordControl.m_oLogicDocument.DrawingDocument, null);
     word_image.init(bin, w, h, null, null);