Merge branch 'develop' into feature/test-copy-img

ONLYOFFICE · Feb 13, 2025 · 0154689 · 0154689
2 parents 73803f6 + ae1bb0d
commit 0154689
Show file tree

Hide file tree

Showing 267 changed files with 61,991 additions and 36,126 deletions.
diff --git a/.github/workflows/common_check.yml b/.github/workflows/common_check.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libatk1.0-0 libcups2 libatk-bridge2.0-0 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libnss3 libgbm1 libasound2
+          sudo apt-get install -y libatk1.0-0 libcups2 libatk-bridge2.0-0 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libnss3 libgbm1 libasound2t64
 
       - name: check out repository
         uses: actions/checkout@v3
@@ -63,6 +63,7 @@ jobs:
           node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/checkbox.html 30000 "--no-sandbox"
           node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/cursorAndSelection.html 30000 "--no-sandbox"
           node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/date-time.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/custom-xml/custom-xml.html 30000 "--no-sandbox"
           node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/floating-position/drawing.html 30000 "--no-sandbox"
           node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/paragraph.html 30000 "--no-sandbox"
           node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/table/correctBadTable.html 30000 "--no-sandbox"
@@ -130,4 +131,4 @@ jobs:
                      -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 \
-                     onlyoffice/doc-builder-testing:next-release rake rspec_critical
+                     onlyoffice/doc-builder-testing:next-release rspec_critical
diff --git a/.github/workflows/dev_check.yml b/.github/workflows/dev_check.yml
@@ -52,6 +52,7 @@ jobs:
           node-qunit-puppeteer tests/word/content-control/inline-level/checkbox.html
           node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
           node-qunit-puppeteer tests/word/content-control/inline-level/date-time.html
+          node-qunit-puppeteer tests/word/custom-xml/custom-xml.html
           node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
           node-qunit-puppeteer tests/word/document-calculation/paragraph.html
           node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
@@ -103,4 +104,4 @@ jobs:
                      -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 \
-                     onlyoffice/doc-builder-testing:next-release rake rspec_critical
+                     onlyoffice/doc-builder-testing:next-release rspec_critical
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
@@ -199,6 +199,7 @@ module.exports = function(grunt) {
 		{
 			cwd: '../common/',
 			src: [
+				'Drawings/Format/path-boolean-min.js',
 				'Charts/ChartStyles.js',
 				'SmartArts/SmartArtData/*',
 				'SmartArts/SmartArtDrawing/*',
@@ -232,7 +233,10 @@ module.exports = function(grunt) {
 		},
 		{
 			cwd: '../pdf/',
-			src: ['src/engine/*'],
+			src: [
+				'src/engine/*',
+				'src/annotations/stamps.json'
+			],
 			dest: path.join(deploy, 'pdf'),
 			name: 'pdf'
 		}

diff --git a/cell/Local/api.js b/cell/Local/api.js
@@ -283,6 +283,8 @@ var c_oAscError = Asc.c_oAscError;
 						printOptionsObj["adjustOptions"]["startPageIndex"] =  options.advancedOptions.asc_getStartPageIndex();
 					if (null != options.advancedOptions.asc_getEndPageIndex())
 						printOptionsObj["adjustOptions"]["endPageIndex"] =  options.advancedOptions.asc_getEndPageIndex();
+					if (null != options.advancedOptions.asc_getActiveSheetsArray())
+						printOptionsObj["adjustOptions"]["activeSheetsArray"] = options.advancedOptions.asc_getActiveSheetsArray();
 				}
 
 				printOptions = JSON.stringify(printOptionsObj);