Исправлены баги с сборкой. Bug #32100, Bug #32101, Bug #32102

e962db5b · Ilya Kirillov · 405eb9d5 · e962db5b · e962db5b · e962db5b
Commit e962db5b authored Apr 01, 2016 by Ilya Kirillov
4 changed files
--- a/word/Private/MailMerge.js
+++ b/word/Private/MailMerge.js
 /*
 *
 * (c) Copyright Ascensio System Limited 2010-2016
 *
 * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
 * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
 * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
 * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
 *
 * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
 * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
 *
 * You can contact Ascensio System SIA by email at sales@onlyoffice.com
 *
 * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
 * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
 *
 * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
 * relevant author attributions when distributing the software. If the display of the logo in its graphic 
 * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
 * in every copy of the program you distribute. 
 * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
 *
 */
 "use strict";
 /**
 * User: Ilja.Kirillov
@@ -181,6 +181,24 @@ asc_docs_api.prototype.asc_DownloadAsMailMerge = function(typeFile, StartIndex,
    }
    return null != oDocumentMailMerge ? true : false;
 };
+asc_docs_api.prototype['asc_StartMailMerge']              = asc_docs_api.prototype.asc_StartMailMerge;
+asc_docs_api.prototype['asc_StartMailMergeByList']        = asc_docs_api.prototype.asc_StartMailMergeByList;
+asc_docs_api.prototype['asc_GetReceptionsCount']          = asc_docs_api.prototype.asc_GetReceptionsCount;
+asc_docs_api.prototype['asc_GetMailMergeFieldsNameList']  = asc_docs_api.prototype.asc_GetMailMergeFieldsNameList;
+asc_docs_api.prototype['asc_AddMailMergeField']           = asc_docs_api.prototype.asc_AddMailMergeField;
+asc_docs_api.prototype['asc_SetHighlightMailMergeFields'] = asc_docs_api.prototype.asc_SetHighlightMailMergeFields;
+asc_docs_api.prototype['asc_PreviewMailMergeResult']      = asc_docs_api.prototype.asc_PreviewMailMergeResult;
+asc_docs_api.prototype['asc_EndPreviewMailMergeResult']   = asc_docs_api.prototype.asc_EndPreviewMailMergeResult;
+asc_docs_api.prototype['sync_StartMailMerge']             = asc_docs_api.prototype.sync_StartMailMerge;
+asc_docs_api.prototype['sync_PreviewMailMergeResult']     = asc_docs_api.prototype.sync_PreviewMailMergeResult;
+asc_docs_api.prototype['sync_EndPreviewMailMergeResult']  = asc_docs_api.prototype.sync_EndPreviewMailMergeResult;
+asc_docs_api.prototype['sync_HighlightMailMergeFields']   = asc_docs_api.prototype.sync_HighlightMailMergeFields;
+asc_docs_api.prototype['asc_getMailMergeData']            = asc_docs_api.prototype.asc_getMailMergeData;
+asc_docs_api.prototype['asc_setMailMergeData']            = asc_docs_api.prototype.asc_setMailMergeData;
+asc_docs_api.prototype['asc_sendMailMergeData']           = asc_docs_api.prototype.asc_sendMailMergeData;
+asc_docs_api.prototype['asc_GetMailMergeFiledValue']      = asc_docs_api.prototype.asc_GetMailMergeFiledValue;
+asc_docs_api.prototype['asc_DownloadAsMailMerge']         = asc_docs_api.prototype.asc_DownloadAsMailMerge;
 //----------------------------------------------------------------------------------------------------------------------
 // Функции для работы с MailMerge
 //----------------------------------------------------------------------------------------------------------------------

--- a/word/Private/StyleManager.js
+++ b/word/Private/StyleManager.js
 /*
 *
 * (c) Copyright Ascensio System Limited 2010-2016
 *
 * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
 * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
 * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
 * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
 *
 * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
 * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
 *
 * You can contact Ascensio System SIA by email at sales@onlyoffice.com
 *
 * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
 * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
 *
 * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
 * relevant author attributions when distributing the software. If the display of the logo in its graphic 
 * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
 * in every copy of the program you distribute. 
 * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
 *
 */
 "use strict";
 /**
 * User: Ilja.Kirillov
@@ -56,6 +56,13 @@ asc_docs_api.prototype.asc_IsDefaultStyleChanged = function(sName)
 {
    return this.WordControl.m_oLogicDocument.Is_DefaultStyleChanged(sName);
 };
+asc_docs_api.prototype['asc_GetStyleFromFormatting'] = asc_docs_api.prototype.asc_GetStyleFromFormatting;
+asc_docs_api.prototype['asc_AddNewStyle']            = asc_docs_api.prototype.asc_AddNewStyle;
+asc_docs_api.prototype['asc_RemoveStyle']            = asc_docs_api.prototype.asc_RemoveStyle;
+asc_docs_api.prototype['asc_RemoveAllCustomStyles']  = asc_docs_api.prototype.asc_RemoveAllCustomStyles;
+asc_docs_api.prototype['asc_IsStyleDefault']         = asc_docs_api.prototype.asc_IsStyleDefault;
+asc_docs_api.prototype['asc_IsDefaultStyleChanged']  = asc_docs_api.prototype.asc_IsDefaultStyleChanged;
 //----------------------------------------------------------------------------------------------------------------------
 //  CDocument
 //----------------------------------------------------------------------------------------------------------------------

--- a/word/Private/TrackRevisions.js
+++ b/word/Private/TrackRevisions.js
 /*
 *
 * (c) Copyright Ascensio System Limited 2010-2016
 *
 * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
 * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
 * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
 * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
 *
 * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
 * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
 *
 * You can contact Ascensio System SIA by email at sales@onlyoffice.com
 *
 * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
 * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
 *
 * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
 * relevant author attributions when distributing the software. If the display of the logo in its graphic 
 * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
 * in every copy of the program you distribute. 
 * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
 *
 */
 "use strict";
 /**
 * User: Ilja.Kirillov
@@ -94,6 +94,21 @@ asc_docs_api.prototype.asc_RejectAllChanges = function()
 {
    this.WordControl.m_oLogicDocument.Reject_AllRevisionChanges();
 };
+asc_docs_api.prototype['asc_SetTrackRevisions']               = asc_docs_api.prototype.asc_SetTrackRevisions;
+asc_docs_api.prototype['asc_IsTrackRevisions']                = asc_docs_api.prototype.asc_IsTrackRevisions;
+asc_docs_api.prototype['sync_BeginCatchRevisionsChanges']     = asc_docs_api.prototype.sync_BeginCatchRevisionsChanges;
+asc_docs_api.prototype['sync_EndCatchRevisionsChanges']       = asc_docs_api.prototype.sync_EndCatchRevisionsChanges;
+asc_docs_api.prototype['sync_AddRevisionsChange']             = asc_docs_api.prototype.sync_AddRevisionsChange;
+asc_docs_api.prototype['asc_AcceptChanges']                   = asc_docs_api.prototype.asc_AcceptChanges;
+asc_docs_api.prototype['asc_RejectChanges']                   = asc_docs_api.prototype.asc_RejectChanges;
+asc_docs_api.prototype['asc_HaveRevisionsChanges']            = asc_docs_api.prototype.asc_HaveRevisionsChanges;
+asc_docs_api.prototype['asc_HaveNewRevisionsChanges']         = asc_docs_api.prototype.asc_HaveNewRevisionsChanges;
+asc_docs_api.prototype['asc_GetNextRevisionsChange']          = asc_docs_api.prototype.asc_GetNextRevisionsChange;
+asc_docs_api.prototype['asc_GetPrevRevisionsChange']          = asc_docs_api.prototype.asc_GetPrevRevisionsChange;
+asc_docs_api.prototype['sync_UpdateRevisionsChangesPosition'] = asc_docs_api.prototype.sync_UpdateRevisionsChangesPosition;
+asc_docs_api.prototype['asc_AcceptAllChanges']                = asc_docs_api.prototype.asc_AcceptAllChanges;
+asc_docs_api.prototype['asc_RejectAllChanges']                = asc_docs_api.prototype.asc_RejectAllChanges;
 //----------------------------------------------------------------------------------------------------------------------
 // CDocument
 //----------------------------------------------------------------------------------------------------------------------

--- a/word/Private/comments.js
+++ b/word/Private/comments.js
@@ -22,28 +22,29 @@
 * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
 *
 */
 "use strict";
 asc_docs_api.prototype.asc_addComment = function(AscCommentData) {
  if (true === CollaborativeEditing.Get_GlobalLock()) {
    return;
  }
  if (null == this.WordControl.m_oLogicDocument) {
    return;
  }
  // Комментарий без цитаты позволяем добавить всегда
  if (true !== this.can_AddQuotedComment() || false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content)) {
    var CommentData = new CCommentData();
    CommentData.Read_FromAscCommentData(AscCommentData);
    this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(historydescription_Document_AddComment);
    var Comment = this.WordControl.m_oLogicDocument.Add_Comment(CommentData);
    if (null != Comment) {
      this.sync_AddComment(Comment.Get_Id(), CommentData);
    }
    return Comment.Get_Id();
  }
 };
\ No newline at end of file
+asc_docs_api.prototype['asc_addComment'] = asc_docs_api.prototype.asc_addComment;
\ No newline at end of file