From 7c584932a064651bf331caa966eeade7bc11ecb9 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Thu, 21 Jul 2022 00:22:51 +0300
Subject: [PATCH] [all] fix bug 58156

---
 apps/documenteditor/main/index.html.deploy             | 6 +++---
 apps/documenteditor/main/index_loader.html.deploy      | 6 +++---
 apps/presentationeditor/main/index.html.deploy         | 6 +++---
 apps/presentationeditor/main/index_loader.html.deploy  | 6 +++---
 apps/spreadsheeteditor/main/index.html.deploy          | 6 +++---
 apps/spreadsheeteditor/main/index_internal.html.deploy | 4 ++--
 apps/spreadsheeteditor/main/index_loader.html.deploy   | 6 +++---
 build/Gruntfile.js                                     | 2 +-
 build/documenteditor.json                              | 6 ------
 build/presentationeditor.json                          | 6 ------
 build/spreadsheeteditor.json                           | 6 ------
 11 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 4e019ae7f..09e5dbe9e 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -318,9 +318,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
     <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
     <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
 
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
index 53d0f76e1..138edc9bb 100644
--- a/apps/documenteditor/main/index_loader.html.deploy
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -317,9 +317,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
 
     <div id="viewport"></div>
     <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 592a84471..bec9af644 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -362,9 +362,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
 
     <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
     <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy
index 44b6de9ab..9c125dfe8 100644
--- a/apps/presentationeditor/main/index_loader.html.deploy
+++ b/apps/presentationeditor/main/index_loader.html.deploy
@@ -318,9 +318,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
 
     <div id="viewport"></div>
 
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index fd4148672..7971b04b4 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -376,9 +376,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/cf-icons.svg" />
 
     <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
diff --git a/apps/spreadsheeteditor/main/index_internal.html.deploy b/apps/spreadsheeteditor/main/index_internal.html.deploy
index 41ad938b2..21389e0ed 100644
--- a/apps/spreadsheeteditor/main/index_internal.html.deploy
+++ b/apps/spreadsheeteditor/main/index_internal.html.deploy
@@ -231,8 +231,8 @@
         };
     </script>
 
-    <!--<inline src="resources/img/header/buttons.svg" />-->
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <!--<inline src="../../common/main/resources/img/header/buttons.svg" />-->
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
 
     <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
 </body>
diff --git a/apps/spreadsheeteditor/main/index_loader.html.deploy b/apps/spreadsheeteditor/main/index_loader.html.deploy
index 22314a906..5613068de 100644
--- a/apps/spreadsheeteditor/main/index_loader.html.deploy
+++ b/apps/spreadsheeteditor/main/index_loader.html.deploy
@@ -317,9 +317,9 @@
         };
     </script>
 
-    <inline src="resources/img/header/icons.svg" />
-    <inline src="resources/img/toolbar/shapetypes.svg" />
-    <inline src="resources/img/toolbar/charttypes.svg" />
+    <inline src="../../common/main/resources/img/header/icons.svg" />
+    <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
+    <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/cf-icons.svg" />
 
     <div id="viewport"></div>
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index db97a6996..f0ed31065 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -320,7 +320,7 @@ module.exports = function(grunt) {
                     src: packageFile.main.clean.prebuild
                 },
                 postbuild: {
-                    src: [...packageFile.main.svgicons.clean, ...packageFile.main.clean.postbuild]
+                    src: [...packageFile.main.clean.postbuild]
                 }
             },
 
diff --git a/build/documenteditor.json b/build/documenteditor.json
index 4fb006694..86d0f48ce 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -186,12 +186,6 @@
         },
         "svgicons": {
             "common": [
-                {
-                    "expand": true,
-                    "cwd": "../apps/common/main/resources/img",
-                    "src": "**/*.svg",
-                    "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img"
-                },
                 {
                     "expand": true,
                     "cwd": "../apps/documenteditor/main/resources/img",
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index dce293b5f..f66c8b22f 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -181,12 +181,6 @@
         },
         "svgicons": {
             "common": [
-                {
-                    "expand": true,
-                    "cwd": "../apps/common/main/resources/img",
-                    "src": "**/*.svg",
-                    "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img"
-                },
                 {
                     "expand": true,
                     "cwd": "../apps/presentationeditor/main/resources/img",
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index cb78ab376..df58fe594 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -194,12 +194,6 @@
         },
         "svgicons": {
             "common": [
-                {
-                    "expand": true,
-                    "cwd": "../apps/common/main/resources/img",
-                    "src": "**/*.svg",
-                    "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img"
-                },
                 {
                     "expand": true,
                     "cwd": "../apps/spreadsheeteditor/main/resources/img",