Commit 917cd03b authored by Sergey.Konovalov's avatar Sergey.Konovalov

Bug 30467 - [Mail Merge] Ошибка в консоли при слиянии документа через почту

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64929 954022d7-b5bf-4e40-9824-e11837661b57
parent ecca8e11
......@@ -6866,7 +6866,7 @@ function _downloadAs(editor, command, oDocumentMailMerge, oMailMergeSendData, tx
// ToDo select csv params
oAdditionalData['codepage'] = 65001;
oAdditionalData['delimiter'] = 4; // c_oAscCsvDelimiter.Comma
} else if (c_oAscFileType.TXT === filetype && !txtOptions) {
} else if (c_oAscFileType.TXT === filetype && !txtOptions && null == oDocumentMailMerge && null == oMailMergeSendData) {
// Мы открывали команду, надо ее закрыть.
editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.DownloadAs);
var cp = {'codepage': c_oAscCodePageUtf8, 'encodings': getEncodingParams()};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment