reader mode

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

Common/wordcopypaste.js

@@ -666,7 +666,11 @@ CopyProcessor.prototype =
                 if(sSrc.length > 0)
                 {
                     sSrc = this.getSrc(sSrc);
-                    sRes += "<img style=\"max-width:100%;\" width=\""+Math.round(ParaItem.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(ParaItem.H * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
+
+                    var _w = (null != ParaItem.W) ? ParaItem.W : ParaItem.Extent.W;
+                    var _h = (null != ParaItem.H) ? ParaItem.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;
                 }
                 // var _canvas     = document.createElement('canvas');

Word/api.js

@@ -1188,7 +1188,9 @@ asc_docs_api.prototype.ContentToHTML = function(bIsRet)
     this.DocumentReaderMode = new CDocumentReaderMode();
     var _old = copyPasteUseBinary;
     copyPasteUseBinary = false;
+    this.WordControl.m_oLogicDocument.Select_All();
     Editor_Copy(this);
+    this.WordControl.m_oLogicDocument.Selection_Remove();
     copyPasteUseBinary = _old;
     this.DocumentReaderMode = null;
     return document.getElementById("SelectId").innerHTML;