Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

common/Native/Wrappers/memory.js

@@ -22,7 +22,7 @@
  * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
 */
-function CPointer()
+function CPointer()
 {
     this.obj    = null;
     this.data   = null;

common/commonDefines.js

@@ -855,6 +855,9 @@ window['Asc']['c_oAscAsyncActionType'] = c_oAscAsyncActionType;
 window['Asc']['c_oAscNumFormatType'] = c_oAscNumFormatType;
 window['Asc']['c_oAscDrawingLayerType'] = c_oAscDrawingLayerType;
 window['Asc']['c_oAscTypeSelectElement'] = c_oAscTypeSelectElement;
+window['Asc']['linerule_AtLeast'] = linerule_AtLeast;
+window['Asc']['linerule_Auto'] = linerule_Auto;
+window['Asc']['linerule_Exact'] = linerule_Exact;
 window['Asc']['c_oAscShdClear'] = shd_Clear; //ToDo по идее должны совпадать переменные
 window['Asc']['c_oAscShdNil'] = shd_Nil;
 window['Asc']['c_oAscChartTitleShowSettings'] = c_oAscChartTitleShowSettings;

word/Drawing/DrawingDocument.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.
- *
-*/
+/*
+ *
+ * (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";
 
 var g_fontManager = new CFontManager();
@@ -2734,8 +2734,10 @@ function CDrawingDocument()
 
         var page = this.m_arrPages[pageIndex];
 
-        var w = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix * page.width_mm / 100) >> 0;
-        var h = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix * page.height_mm / 100) >> 0;
+        var dKoef = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix / 100);
+
+        var w = (page.width_mm * dKoef + 0.5) >> 0;
+        var h = (page.height_mm * dKoef + 0.5) >> 0;
 
         if (this.m_oWordControl.bIsRetinaSupport)
         {

word/Drawing/HtmlPage.js

@@ -3291,8 +3291,8 @@ function CEditorPage(api)
         var lStart = 0;
         for (var i = 0; i < this.m_oDrawingDocument.m_lPagesCount; i++)
         {
-            var _pageWidth = parseInt(this.m_oDrawingDocument.m_arrPages[i].width_mm * dKoef);
-            var _pageHeight = parseInt(this.m_oDrawingDocument.m_arrPages[i].height_mm * dKoef);
+            var _pageWidth = (this.m_oDrawingDocument.m_arrPages[i].width_mm * dKoef + 0.5) >> 0;
+            var _pageHeight = (this.m_oDrawingDocument.m_arrPages[i].height_mm * dKoef + 0.5) >> 0;
 
             if (false === bIsFoundFirst)
             {

word/Editor/Field.js

@@ -31,7 +31,8 @@
  */
 
 var fieldtype_UNKNOWN    = 0x0000;
-var fieldtype_MERGEFIELD = 0x0001;
+var fieldtype_MERGEFIELD = 0x0001;
+var fieldtype_PAGENUM    = 0x0002;
 
 /**
  *

word/Editor/Serialize2.js

@@ -7988,23 +7988,17 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
             //для случая гиперссылок на несколько строк в конце параграфа завершаем начатые, а начале - продолжаем незавершенные
             if (this.aFields.length > 0) {
                 for (var i = 0; i < this.aFields.length; ++i) {
-                    var elem = this.aFields[i];
-					elem.commitElem = false;
-					var oField = elem.field;
-					if(null != oField){
-						if(para_Hyperlink == oField.Get_Type()){
-							var oHyperlink = new ParaHyperlink();
-							oHyperlink.Set_Paragraph(paragraph);
-							oHyperlink.Set_Value(oField.Get_Value());
-							oHyperlink.Set_ToolTip(oField.Get_ToolTip());
-							oParStruct.addElem(oHyperlink);
-							elem.commitElem = true;
-						}
-						else if(para_PageNum == oField.Get_Type()){
-							oParStruct.addElem(null);
-							elem.commitElem = true;
-						}
-					}
+					var oField = this.aFields[i];
+					if (null != oField && para_Hyperlink == oField.Get_Type()) {
+						var oHyperlink = new ParaHyperlink();
+						oHyperlink.Set_Paragraph(paragraph);
+						oHyperlink.Set_Value(oField.Get_Value());
+						oHyperlink.Set_ToolTip(oField.Get_ToolTip());
+						oParStruct.addElem(oHyperlink);
+					} else {
+                        //зануляем, чтобы когда придет fldend ничего не делать
+                        this.aFields[i] = null;
+                    }
                 }
             }
             res = this.bcr.Read1(length, function(t, l){
@@ -8124,18 +8118,9 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 		        return oThis.ReadFldSimple(t, l, oFldSimpleObj, oParStruct);
 		    });
 			if(null != oFldSimpleObj.ParaField){
-				var oField = oFldSimpleObj.ParaField;
-				var nFieldType = oField.Get_Type();
-				if(para_PageNum == nFieldType)
-				{
-					var oNewRun = new ParaRun(oParStruct.paragraph);
-					oNewRun.Add_ToContent(0, oField);
-					oParStruct.addToContent(oNewRun);
-				}
-				else
-					oParStruct.addToContent(oField);
-				if (para_Field == nFieldType && editor)
-					editor.WordControl.m_oLogicDocument.Register_Field(oField);
+                //чтобы не писать здесь логику для pagenum
+                oParStruct.addElem(oFldSimpleObj.ParaField);
+                oParStruct.commitElem();
 			}
 		} else if (c_oSerParType.Del == type) {
             var reviewInfo = new CReviewInfo();
@@ -8176,19 +8161,13 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 			oFldSimpleObj.ParaField = this.parseField(Instr, oParStruct.paragraph);
         }
         else if (c_oSer_FldSimpleType.Content === type) {
-			if(null != oFldSimpleObj.ParaField){
-				if(para_PageNum != oFldSimpleObj.ParaField.Get_Type())
-				{
-					var oFldStruct = new OpenParStruct(oFldSimpleObj.ParaField, oParStruct.Content, oParStruct.paragraph);
-					res = this.bcr.Read1(length, function (t, l) {
-						return oThis.ReadParagraphContent(t, l, oFldStruct);
-					});
-					oFldStruct.commitAll();
-				}
-				else
-					res = c_oSerConstants.ReadUnknown;
-			}
-			else{
+			if(null != oFldSimpleObj.ParaField) {
+				var oFldStruct = new OpenParStruct(oFldSimpleObj.ParaField, oParStruct.Content, oParStruct.paragraph);
+				res = this.bcr.Read1(length, function (t, l) {
+					return oThis.ReadParagraphContent(t, l, oFldStruct);
+				});
+				oFldStruct.commitAll();
+			} else {
 				res = this.bcr.Read1(length, function (t, l) {
 					return oThis.ReadParagraphContent(t, l, oParStruct);
 				});
@@ -8398,27 +8377,18 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
             oRes.bRes = false;
 			var sField = this.stream.GetString2LE(length);
 			var oField = this.parseField(sField, oParStruct.paragraph);
-			var commitElem = false;
-			if(null != oField)
-			{
-				if(para_PageNum == oField.Get_Type()){
-					oNewElem = oField;
-					//досрочно добавляем oPos.run потому что после oParStruct.addElem(null); он никуда не добавится
-					oParStruct.addToContent(oPos.run);
-					oParStruct.addElem(null);
-				}
-				else
-					oParStruct.addElem(oField);
-				commitElem = true;
+			if (null != oField) {
+				oParStruct.addElem(oField);
 			}
-            this.aFields.push({field: oField, commitElem: commitElem});
+            this.aFields.push(oField);
         }
         else if(c_oSerRunType.fldend === type)
         {
             oRes.bRes = false;
 			var elem = this.aFields.pop();
-			if(elem.commitElem)
-				oParStruct.commitElem();
+			if (elem) {
+                oParStruct.commitElem();
+            }
         }
         else if (c_oSerRunType._LastRun === type)
             this.oReadResult.bLastRun = true;
@@ -8596,10 +8566,12 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 			}
 		}
 		else if("PAGE" == sFieldType){
-			oRes = new ParaPageNum();
+            oRes = new ParaField(fieldtype_PAGENUM, aArguments, aSwitches);
 		}
 		else if("MERGEFIELD" == sFieldType){
 			oRes = new ParaField(fieldtype_MERGEFIELD, aArguments, aSwitches);
+            if (editor)
+               editor.WordControl.m_oLogicDocument.Register_Field(oRes);
 		}
 		return oRes;
 	}
@@ -12417,7 +12389,18 @@ CFontsCharMap.prototype =
             this.CurrentFontInfo.CharArray[_find] = true;
     }
 }
-
+function getStyleFirstRun(oField){
+    var res = null;
+    //берем первый с непустым Content, потому что в случае fldstart первым будет run fldstart
+    for (var i = 0 ; i < oField.Content.length; ++i) {
+        var run = oField.Content[i];
+        if (run.Content.length > 0) {
+            res = run.Get_FirstTextPr();
+            break;
+        }
+    }
+    return res;
+}
 function OpenParStruct(oContainer, Content, paragraph) {
     this.DocContent = Content;
     this.paragraph = paragraph;
@@ -12474,8 +12457,20 @@ OpenParStruct.prototype = {
         if (this.stack.length > 1) {
             var oPrevElem = this.stack.pop();
             this.cur = this.stack[this.stack.length - 1];
-            if (null != oPrevElem.elem && oPrevElem.elem.Content && oPrevElem.elem.Content.length > 0)
-                this.addToContent(oPrevElem.elem);
+            var elem = oPrevElem.elem;
+            if (null != elem && elem.Content && elem.Content.length > 0) {
+                if (para_Field == elem.Get_Type() && fieldtype_PAGENUM == elem.Get_FieldType()) {
+                    var oNewRun = new ParaRun(this.paragraph);
+                    var rPr = getStyleFirstRun(elem);
+                    if (rPr) {
+                        oNewRun.Set_Pr(rPr);
+                    }
+                    oNewRun.Add_ToContent(0, new ParaPageNum());
+                    this.addToContent(oNewRun);
+                } else {
+                    this.addToContent(elem);
+                }
+            }
             bRes = true;
         }
         return bRes;