From c3c2519bee85700d78baa9bd63ca9f59946b5361 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 8 Oct 2021 19:54:58 +0300
Subject: [PATCH] [DE] Download as oform and docxf

---
 .../main/resources/img/doc-formats/docxf.svg   |  8 ++++++++
 .../main/resources/img/doc-formats/oform.svg   | 18 ++++++++++++++++++
 .../main/app/view/FileMenuPanels.js            |  6 ++++++
 apps/documenteditor/main/index.html            |  2 ++
 apps/documenteditor/main/index.html.deploy     |  2 ++
 apps/documenteditor/main/index_loader.html     |  2 ++
 .../main/index_loader.html.deploy              |  2 ++
 7 files changed, 40 insertions(+)
 create mode 100644 apps/common/main/resources/img/doc-formats/docxf.svg
 create mode 100644 apps/common/main/resources/img/doc-formats/oform.svg

diff --git a/apps/common/main/resources/img/doc-formats/docxf.svg b/apps/common/main/resources/img/doc-formats/docxf.svg
new file mode 100644
index 000000000..4f92c33a4
--- /dev/null
+++ b/apps/common/main/resources/img/doc-formats/docxf.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+  <symbol id="svg-format-docxf">
+    <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
+<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
+<path d="M41.6406 109.635C41.6406 111.045 41.2383 112.125 40.4336 112.875C39.6328 113.625 38.4746 114 36.959 114H34.5332V105.434H37.2227C38.6211 105.434 39.707 105.803 40.4805 106.541C41.2539 107.279 41.6406 108.311 41.6406 109.635ZM39.7539 109.682C39.7539 107.842 38.9414 106.922 37.3164 106.922H36.3496V112.5H37.1289C38.8789 112.5 39.7539 111.561 39.7539 109.682ZM51.1914 109.705C51.1914 111.123 50.8398 112.213 50.1367 112.975C49.4336 113.736 48.4258 114.117 47.1133 114.117C45.8008 114.117 44.793 113.736 44.0898 112.975C43.3867 112.213 43.0352 111.119 43.0352 109.693C43.0352 108.268 43.3867 107.18 44.0898 106.43C44.7969 105.676 45.8086 105.299 47.125 105.299C48.4414 105.299 49.4473 105.678 50.1426 106.436C50.8418 107.193 51.1914 108.283 51.1914 109.705ZM44.9395 109.705C44.9395 110.662 45.1211 111.383 45.4844 111.867C45.8477 112.352 46.3906 112.594 47.1133 112.594C48.5625 112.594 49.2871 111.631 49.2871 109.705C49.2871 107.775 48.5664 106.811 47.125 106.811C46.4023 106.811 45.8574 107.055 45.4902 107.543C45.123 108.027 44.9395 108.748 44.9395 109.705ZM56.6055 106.822C55.9219 106.822 55.3926 107.08 55.0176 107.596C54.6426 108.107 54.4551 108.822 54.4551 109.74C54.4551 111.65 55.1719 112.605 56.6055 112.605C57.207 112.605 57.9355 112.455 58.791 112.154V113.678C58.0879 113.971 57.3027 114.117 56.4355 114.117C55.1895 114.117 54.2363 113.74 53.5762 112.986C52.916 112.229 52.5859 111.143 52.5859 109.729C52.5859 108.838 52.748 108.059 53.0723 107.391C53.3965 106.719 53.8613 106.205 54.4668 105.85C55.0762 105.49 55.7891 105.311 56.6055 105.311C57.4375 105.311 58.2734 105.512 59.1133 105.914L58.5273 107.391C58.207 107.238 57.8848 107.105 57.5605 106.992C57.2363 106.879 56.918 106.822 56.6055 106.822ZM67.5449 114H65.4707L63.4785 110.76L61.4863 114H59.541L62.3828 109.582L59.7227 105.434H61.7266L63.5723 108.516L65.3828 105.434H67.3398L64.6504 109.682L67.5449 114Z" fill="white"/>
+<path d="M67.8 48L61.5 75L54.5 48H51.5H48.5L41.5 75L35.2 48H29.4L37.9 82H44.3L51.5 54.1L58.7 82H65.1L73.6 48H67.8Z" fill="white"/>
+  </symbol>
+</svg>
diff --git a/apps/common/main/resources/img/doc-formats/oform.svg b/apps/common/main/resources/img/doc-formats/oform.svg
new file mode 100644
index 000000000..9e2067a69
--- /dev/null
+++ b/apps/common/main/resources/img/doc-formats/oform.svg
@@ -0,0 +1,18 @@
+<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="svg-format-oform">
+<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#2CA498"/>
+<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
+<path d="M36.8535 109.705C36.8535 111.123 36.502 112.213 35.7988 112.975C35.0957 113.736 34.0879 114.117 32.7754 114.117C31.4629 114.117 30.4551 113.736 29.752 112.975C29.0488 112.213 28.6973 111.119 28.6973 109.693C28.6973 108.268 29.0488 107.18 29.752 106.43C30.459 105.676 31.4707 105.299 32.7871 105.299C34.1035 105.299 35.1094 105.678 35.8047 106.436C36.5039 107.193 36.8535 108.283 36.8535 109.705ZM30.6016 109.705C30.6016 110.662 30.7832 111.383 31.1465 111.867C31.5098 112.352 32.0527 112.594 32.7754 112.594C34.2246 112.594 34.9492 111.631 34.9492 109.705C34.9492 107.775 34.2285 106.811 32.7871 106.811C32.0645 106.811 31.5195 107.055 31.1523 107.543C30.7852 108.027 30.6016 108.748 30.6016 109.705Z" fill="white"/>
+<path d="M40.416 114H38.6289V105.434H43.5391V106.922H40.416V109.131H43.3223V110.613H40.416V114Z" fill="white"/>
+<path d="M52.9902 109.705C52.9902 111.123 52.6387 112.213 51.9355 112.975C51.2324 113.736 50.2246 114.117 48.9121 114.117C47.5996 114.117 46.5918 113.736 45.8887 112.975C45.1855 112.213 44.834 111.119 44.834 109.693C44.834 108.268 45.1855 107.18 45.8887 106.43C46.5957 105.676 47.6074 105.299 48.9238 105.299C50.2402 105.299 51.2461 105.678 51.9414 106.436C52.6406 107.193 52.9902 108.283 52.9902 109.705ZM46.7383 109.705C46.7383 110.662 46.9199 111.383 47.2832 111.867C47.6465 112.352 48.1895 112.594 48.9121 112.594C50.3613 112.594 51.0859 111.631 51.0859 109.705C51.0859 107.775 50.3652 106.811 48.9238 106.811C48.2012 106.811 47.6562 107.055 47.2891 107.543C46.9219 108.027 46.7383 108.748 46.7383 109.705Z" fill="white"/>
+<path d="M56.582 109.236H57.168C57.7422 109.236 58.166 109.141 58.4395 108.949C58.7129 108.758 58.8496 108.457 58.8496 108.047C58.8496 107.641 58.709 107.352 58.4277 107.18C58.1504 107.008 57.7188 106.922 57.1328 106.922H56.582V109.236ZM56.582 110.713V114H54.7656V105.434H57.2617C58.4258 105.434 59.2871 105.646 59.8457 106.072C60.4043 106.494 60.6836 107.137 60.6836 108C60.6836 108.504 60.5449 108.953 60.2676 109.348C59.9902 109.738 59.5977 110.045 59.0898 110.268C60.3789 112.193 61.2188 113.438 61.6094 114H59.5938L57.5488 110.713H56.582Z" fill="white"/>
+<path d="M66.3145 114L64.252 107.279H64.1992C64.2734 108.646 64.3105 109.559 64.3105 110.016V114H62.6875V105.434H65.1602L67.1875 111.984H67.2227L69.373 105.434H71.8457V114H70.1523V109.945C70.1523 109.754 70.1543 109.533 70.1582 109.283C70.166 109.033 70.1934 108.369 70.2402 107.291H70.1875L67.9785 114H66.3145Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 85H81V41H19V85ZM17 39V87H83V39H17Z" fill="white"/>
+<rect x="19" y="41" width="62" height="44" fill="#41ADA2"/>
+<rect x="29" y="50" width="5" height="2" fill="white"/>
+<rect x="36" y="50" width="5" height="2" fill="white"/>
+<rect x="29" y="74" width="5" height="2" fill="white"/>
+<rect x="36" y="74" width="5" height="2" fill="white"/>
+<rect width="22" height="2" transform="matrix(-4.37114e-08 1 1 4.37114e-08 34 52)" fill="white"/>
+</symbol>
+</svg>
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 979a3aefb..950979fed 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -64,6 +64,9 @@ define([
             {name: 'RTF',   imgCls: 'rtf',   type: Asc.c_oAscFileType.RTF}
         ],[
             {name: 'DOCM',  imgCls: 'docm',  type: Asc.c_oAscFileType.DOCM},
+            {name: 'DOCXF',  imgCls: 'docxf',  type: Asc.c_oAscFileType.DOCXF},
+            {name: 'OFORM',  imgCls: 'oform',  type: Asc.c_oAscFileType.OFORM}
+        ],[
             {name: 'HTML (Zipped)',  imgCls: 'html',  type: Asc.c_oAscFileType.HTML},
             {name: 'FB2',   imgCls: 'fb2',  type: Asc.c_oAscFileType.FB2},
             {name: 'EPUB',  imgCls: 'epub',  type: Asc.c_oAscFileType.EPUB}
@@ -137,6 +140,9 @@ define([
             {name: 'RTF',   imgCls: 'rtf',   type: Asc.c_oAscFileType.RTF, ext: '.rtf'}
         ],[
             {name: 'DOCM',  imgCls: 'docm',  type: Asc.c_oAscFileType.DOCM, ext: '.docm'},
+            {name: 'DOCXF',  imgCls: 'docxf',  type: Asc.c_oAscFileType.DOCXF, ext: '.docxf'},
+            {name: 'OFORM',  imgCls: 'oform',  type: Asc.c_oAscFileType.OFORM, ext: '.oform'}
+        ],[
             {name: 'HTML (Zipped)',  imgCls: 'html',  type: Asc.c_oAscFileType.HTML, ext: '.html'},
             {name: 'FB2',   imgCls: 'fb2',  type: Asc.c_oAscFileType.FB2, ext: '.fb2'},
             {name: 'EPUB',  imgCls: 'epub',  type: Asc.c_oAscFileType.EPUB, ext: '.epub'}
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 4e42d513a..8d72d3a61 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -316,6 +316,8 @@
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/fb2.svg">
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/epub.svg">
     <img class="inline-svg" src="../../common/main/resources/img/doc-formats/docm.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/oform.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/docxf.svg">
     <img class="inline-svg" src="resources/img/blank.svg">
     <img class="inline-svg" src="resources/img/recent-file.svg">
     <img class="inline-svg" src="resources/img/file-template.svg">
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 7b6f06933..a3ec6e07f 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -310,6 +310,8 @@
     <inline src="resources/img/doc-formats/fb2.svg" />
     <inline src="resources/img/doc-formats/epub.svg" />
     <inline src="resources/img/doc-formats/docm.svg" />
+    <inline src="resources/img/doc-formats/oform.svg" />
+    <inline src="resources/img/doc-formats/docxf.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/recent-file.svg" />
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
index 1c9047bde..dd264349c 100644
--- a/apps/documenteditor/main/index_loader.html
+++ b/apps/documenteditor/main/index_loader.html
@@ -283,6 +283,8 @@
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/fb2.svg">
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/epub.svg">
 <img class="inline-svg" src="../../common/main/resources/img/doc-formats/docm.svg">
+<img class="inline-svg" src="../../common/main/resources/img/doc-formats/oform.svg">
+<img class="inline-svg" src="../../common/main/resources/img/doc-formats/docxf.svg">
 <img class="inline-svg" src="resources/img/blank.svg">
 <img class="inline-svg" src="resources/img/recent-file.svg">
 <img class="inline-svg" src="resources/img/file-template.svg">
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
index 1a25ff3f2..3f60b2346 100644
--- a/apps/documenteditor/main/index_loader.html.deploy
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -328,6 +328,8 @@
     <inline src="resources/img/doc-formats/fb2.svg" />
     <inline src="resources/img/doc-formats/epub.svg" />
     <inline src="resources/img/doc-formats/docm.svg" />
+    <inline src="resources/img/doc-formats/oform.svg" />
+    <inline src="resources/img/doc-formats/docxf.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/recent-file.svg" />