Merge branch release/v7.2.0 into master

.github/workflows/check.yml

@@ -25,8 +25,15 @@ jobs:
           npm install --prefix build
           grunt --gruntfile build/Gruntfile.js develop
           node-qunit-puppeteer cell/.unit-tests/FormulaTests.html
-          node-qunit-puppeteer cell/.unit-tests/PivotTests.html
+          node-qunit-puppeteer cell/.unit-tests/subdir/PivotTests.html
           node-qunit-puppeteer cell/.unit-tests/CopyPasteTests.html
+          node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
+          node-qunit-puppeteer tests/word/document-calculation/paragraph.html
+          node-qunit-puppeteer tests/word/document-calculation/table/flowTablePosition.html
+          node-qunit-puppeteer tests/word/forms/forms.html
+          node-qunit-puppeteer tests/word/forms/complexForm.html
+          node-qunit-puppeteer tests/word/api/api.html
+          node-qunit-puppeteer tests/word/styles/paraPr.html
   builder-tests:
     runs-on: ubuntu-latest
     steps:
@@ -40,9 +47,8 @@ jobs:
            npm install -g grunt-cli
            npm install --prefix build
            grunt --level=WHITESPACE_ONLY --base build --gruntfile build/Gruntfile.js
-           docker pull onlyofficeqa/doc-builder-testing:latest
            docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
                       -v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
                       -v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
                       -v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
-                      onlyofficeqa/doc-builder-testing:latest rake rspec_critical
+                      onlyofficeqa/doc-builder-testing:next-release rake rspec_critical

.gitignore

@@ -1,12 +1,7 @@
 .idea/
 build/node_modules
 build/$weak$.js
-common/libfont/wasm/build/emsdk
-common/libfont/wasm/build/freetype*
-common/libfont/wasm/build/fonts.*
 common/AllFonts.js
-common/libfont/js/fonts.js
-common/libfont/wasm/fonts.js
 common/Images/fonts_thumbnail*
 common/Images/themes_thumbnail*
 slide/themes/theme*
@@ -21,3 +16,7 @@ slide/sdk-all.props.js.map
 slide/sdk-all.vars.js.map
 word/sdk-all.props.js.map
 word/sdk-all.vars.js.map
+node_modules
+package-lock.json
+*/node_modules
+*/package-lock.json

build/Gruntfile.js

@@ -83,7 +83,6 @@ module.exports = function(grunt) {
 	}
 
 	function CConfig(pathConfigs) {
-		this.fonts = null;
 		this.externs = null;
 		this.word = null;
 		this.cell = null;
@@ -123,14 +122,13 @@ module.exports = function(grunt) {
 			mergeProps(this[name], option);			
 		}
 
-		appendOption.call(this, 'fonts');
 		appendOption.call(this, 'externs');
 		appendOption.call(this, 'word');
 		appendOption.call(this, 'cell');
 		appendOption.call(this, 'slide');
 	};
 	CConfig.prototype.valid = function () {
-		return this.fonts && this.externs && this.word && this.cell && this.slide;
+		return this.externs && this.word && this.cell && this.slide;
 	};
 
 	function getExterns(config) {
@@ -211,8 +209,6 @@ module.exports = function(grunt) {
 			banner: '(function(window, undefined) {',
 			footer: '})(window);'
 		};
-		const fontsWasmTmp = 'fonts-wasm-tmp.js';
-		const fontsJsTmp = 'fonts-js-tmp.js';
 		const sdkMinTmp = 'sdk-min-tmp.js';
 		const sdkAllTmp = 'sdk-all-tmp.js';
 		const sdkWordTmp = 'sdk-word-tmp.js';
@@ -230,14 +226,6 @@ module.exports = function(grunt) {
 
 		grunt.initConfig({
 			concat: {
-				wasm: {
-					src: configs.fonts['wasm'],
-					dest: fontsWasmTmp
-				},
-				js: {
-					src: configs.fonts['js'],
-					dest: fontsJsTmp
-				},
 				wordsdkmin: {
 					options: optionsSdkMin,
 					src: getFilesMin(configWord),
@@ -288,11 +276,9 @@ module.exports = function(grunt) {
 							'--rewrite_polyfills=true', '--jscomp_off=checkVars',
 							'--warning_level=QUIET', '--compilation_level=' + level,
 							'--module=polyfill:1:', '--js=' + emptyJs,
-							'--module=fontswasm:1:polyfill', '--js=' + fontsWasmTmp,
-							'--module=fontsjs:1:fontswasm', '--js=' + fontsJsTmp,
-							'--module=word:1:fontswasm', '--js=' + sdkWordTmp,
-							'--module=cell:1:fontswasm', '--js=' + sdkCellTmp,
-							'--module=slide:1:fontswasm', '--js=' + sdkSlideTmp)
+							'--module=word:1:polyfill', '--js=' + sdkWordTmp,
+							'--module=cell:1:polyfill', '--js=' + sdkCellTmp,
+							'--module=slide:1:polyfill', '--js=' + sdkSlideTmp)
 					}
 				}
 			},
@@ -303,8 +289,6 @@ module.exports = function(grunt) {
 					},
 					src: [
 						emptyJs,
-						fontsWasmTmp,
-						fontsJsTmp,
 						sdkMinTmp,
 						sdkAllTmp,
 						sdkWordTmp,
@@ -319,15 +303,11 @@ module.exports = function(grunt) {
 	grunt.registerTask('license', 'Add license', function () {
 		const appCopyright = "Copyright (C) Ascensio System SIA 2012-" + grunt.template.today('yyyy') +". All rights reserved";
 		const publisherUrl = "https://www.onlyoffice.com/";
-		const fonts = '../common/libfont/';
 		const deploy = '../deploy/sdkjs/';
 		const word = path.join(deploy, 'word');
 		const cell = path.join(deploy, 'cell');
 		const slide = path.join(deploy, 'slide');
 		const polyfill = 'polyfill.js';
-		const fontsWasm = 'fontswasm.js';
-		const fontsJs = 'fontsjs.js';
-		const fontFile = 'fonts.js';
 		const wordJs = 'word.js';
 		const cellJs = 'cell.js';
 		const slideJs = 'slide.js';
@@ -354,8 +334,6 @@ module.exports = function(grunt) {
 
 		const concatSdk = {files:{}};
 		const concatSdkFiles = concatSdk['files'];
-		concatSdkFiles[fontsWasm] = [license, fontsWasm];
-		concatSdkFiles[fontsJs] = [license, fontsJs];
 		concatSdkFiles[getSdkPath(true, word)] = [license, polyfill, getSdkPath(true, word)];
 		concatSdkFiles[getSdkPath(false, word)] = [license, getSdkPath(false, word)];
 		concatSdkFiles[getSdkPath(true, cell)] = [license, polyfill, getSdkPath(true, cell)];
@@ -400,8 +378,6 @@ module.exports = function(grunt) {
 						]
 					},
 					files: [
-						{src: [fontsWasm], dest: path.join(fonts, 'wasm', fontFile)},
-						{src: [fontsJs], dest: path.join(fonts, 'js', fontFile)},
 						{expand: true, flatten: true, src: [getSdkPath(true, word), getSdkPath(false, word)], dest: word + '/'},
 						{expand: true, flatten: true, src: [getSdkPath(true, cell), getSdkPath(false, cell)], dest: cell + '/'},
 						{expand: true, flatten: true, src: [getSdkPath(true, slide), getSdkPath(false, slide)], dest: slide + '/'}
@@ -424,10 +400,10 @@ module.exports = function(grunt) {
 								'Images/reporter/*',
 								'Images/icons/*',
 								'Native/*.js',
-								'libfont/js/fonts.*',
-								'libfont/wasm/fonts.*',
+								'libfont/engine/*',
 								'spell/spell/*',
-								'hash/hash/*'
+								'hash/hash/*',
+								'zlib/engine/*'
 							],
 							dest: path.join(deploy, 'common')
 						},
@@ -459,8 +435,6 @@ module.exports = function(grunt) {
 					},
 					src: [
 						polyfill,
-						fontsWasm,
-						fontsJs,
 						wordJs,
 						cellJs,
 						slideJs

build/build.bat

@@ -1,7 +1,7 @@
 CD /D %~dp0
 call npm install -g grunt-cli
 call npm install
-rem call grunt --level=WHITESPACE_ONLY --desktop=true --formatting=PRETTY_PRINT
+rem call grunt --level=WHITESPACE_ONLY --desktop=false --formatting=PRETTY_PRINT
 call grunt --level=ADVANCED
 
 pause

cell/.unit-tests/CopyPasteTests.html

@@ -9,7 +9,6 @@
 		<link type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/qunit/2.16.0/qunit.css" rel="stylesheet" media="screen" />
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/qunit/2.16.0/qunit.js"></script>
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
-		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.5.0/jszip.min.js"></script>
 
 
 		<script type="text/javascript" src="../../develop/sdkjs/cell/scripts.js"></script>

cell/.unit-tests/CopyPasteTests.js

@@ -33,6 +33,7 @@
 $(function () {
 
 	Asc.spreadsheet_api.prototype._init = function () {
+		this._loadModules();
 	};
 	Asc.spreadsheet_api.prototype._loadFonts = function (fonts, callback) {
 		callback();
@@ -61,16 +62,20 @@ $(function () {
 	};
 	AscCommon.baseEditorsApi.prototype._onEndLoadSdk = function () {
 	};
+	Asc.ReadDefTableStyles = function(){};
 
 
-	var sData = AscCommon.getEmpty();
 	var api = new Asc.spreadsheet_api({
 		'id-view': 'editor_sdk'
 	});
+	api.FontLoader = {
+		LoadDocumentFonts: function() {}
+	};
 	window["Asc"]["editor"] = api;
 	AscCommon.g_oTableId.init();
 	api._onEndLoadSdk();
-	api._openDocument(sData);
+	api.isOpenOOXInBrowser = false;
+	api._openDocument(AscCommon.getEmpty());
 	api._openOnClient();
 	api.collaborativeEditing = new AscCommonExcel.CCollaborativeEditing({});
 	api.wb = new AscCommonExcel.WorkbookView(api.wbModel, api.controller, api.handlers, api.HtmlElement,

cell/.unit-tests/FormulaTests.js

@@ -3504,6 +3504,22 @@ $( function () {
         assert.ok( oParser.parse() );
         assert.strictEqual( oParser.calculate().getValue(), "#VALUE!" );
 
+		oParser = new parserFormula( "SEARCH(\"pe\",\"dEFabcdEF\",2)", "C2", ws );
+		assert.ok( oParser.parse() );
+		assert.strictEqual( oParser.calculate().getValue(), "#VALUE!" );
+
+		oParser = new parserFormula( "SEARCH(\"de\",\"dEFabcdEF\",2)", "C2", ws );
+		assert.ok( oParser.parse() );
+		assert.strictEqual( oParser.calculate().getValue(), 7 );
+
+		oParser = new parserFormula( "SEARCH(\"de\",\"dEFabcdEF\",0)", "C2", ws );
+		assert.ok( oParser.parse() );
+		assert.strictEqual( oParser.calculate().getValue(), "#VALUE!" );
+
+		oParser = new parserFormula( "SEARCH(\"de\",\"dEFabcdEF\",-2)", "C2", ws );
+		assert.ok( oParser.parse() );
+		assert.strictEqual( oParser.calculate().getValue(), "#VALUE!" );
+
 		testArrayFormula2(assert, "SEARCH", 2, 3);
     } );
 

cell/.unit-tests/open-oox-in-browser.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+    <title>Unit Tests</title>
+
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <link type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.css" rel="stylesheet" media="screen" />
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
+
+    <script type="text/javascript" src="../../develop/sdkjs/cell/scripts.js"></script>
+    <script type="text/javascript">
+		window.sdk_scripts.forEach(function(item){
+			document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>');
+		});
+    </script>
+
+    <script type="text/javascript" src="open-oox-in-browser.js"></script>
+</head>
+<body>
+<h1 id="qunit-header">stax-reader</h1>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+<div id="qunit-fixture">test markup, will be hidden</div>
+</body>
+</html>