mail merge

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

Common/Native/native.js

@@ -379,7 +379,7 @@ function NativeGetFileDataHtml()
 function NativeStartMailMergeByList(database)
 {
     if (_api.asc_StartMailMergeByList)
-        return _api.asc_StartMailMergeByList(JSON.parse(database));
+        return _api.asc_StartMailMergeByList(database);
     return undefined;
 }
 function NativePreviewMailMergeResult(index)

Word/api.js

@@ -7656,14 +7656,14 @@ window["asc_docs_api"].prototype["asc_nativeGetFileData"] = function()
 
 window["asc_docs_api"].prototype["asc_nativeGetHtml"] = function()
 {
-    var _old = window.copyPasteUseBinary;
-    window.copyPasteUseBinary = false;
+    var _old = copyPasteUseBinary;
+    copyPasteUseBinary = false;
     this.WordControl.m_oLogicDocument.Select_All();
-    var oCopyProcessor = new CopyProcessor(api);
+    var oCopyProcessor = new CopyProcessor(this);
     oCopyProcessor.Start();
     var _ret = oCopyProcessor.getInnerHtml();
     this.WordControl.m_oLogicDocument.Selection_Remove();
-    window.copyPasteUseBinary = _old;
+    copyPasteUseBinary = _old;
     return _ret;
 };