[feature] Allow open vsdx

ONLYOFFICE · Nov 10, 2024 · 8b8dacf · 8b8dacf
1 parent cb5b51d
commit 8b8dacf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
@@ -157,7 +157,8 @@ const cfgTableChanges = config.get('services.CoAuthoring.sql.tableChanges');
 const EditorTypes = {
   document : 0,
   spreadsheet : 1,
-  presentation : 2
+  presentation : 2,
+  draw : 3
 };
 
 const defaultHttpPort = 80, defaultHttpsPort = 443;	// Default ports (for http and https)
@@ -1499,6 +1500,9 @@ function getOpenFormatByEditor(editorType) {
     case EditorTypes.presentation:
       res = constants.AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
       break;
+    case EditorTypes.draw:
+      res = constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
+      break;
     default:
       res = constants.AVS_OFFICESTUDIO_FILE_CANVAS_WORD;
       break;
@@ -3113,6 +3117,7 @@ exports.install = function(server, callbackFunction) {
         fCheckLock = _checkLockExcel;
         break;
       case EditorTypes.presentation:
+      case EditorTypes.draw:
         // PP
         fCheckLock = _checkLockPresentation;
         break;

diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
@@ -521,7 +521,10 @@ function* commandOpen(ctx, conn, cmd, outputData, opt_upsertRes, opt_bIsRestore)
           cmd.setForgotten(cmd.getDocId());
         }
         //add task
-        cmd.setOutputFormat(docsCoServer.getOpenFormatByEditor(conn.editorType));
+        if (!cmd.getOutputFormat()) {
+          //todo remove getOpenFormatByEditor after 8.2.1
+          cmd.setOutputFormat(docsCoServer.getOpenFormatByEditor(conn.editorType));
+        }
         cmd.setEmbeddedFonts(false);
         var dataQueue = new commonDefines.TaskQueueData();
         dataQueue.setCtx(ctx);
@@ -576,7 +579,10 @@ function* commandReopen(ctx, conn, cmd, outputData) {
     if (upsertRes.affectedRows > 0) {
       //add task
       cmd.setUrl(null);//url may expire
-      cmd.setOutputFormat(docsCoServer.getOpenFormatByEditor(conn.editorType));
+      if (!cmd.getOutputFormat()) {
+        //todo remove getOpenFormatByEditor after 8.2.1
+        cmd.setOutputFormat(docsCoServer.getOpenFormatByEditor(conn.editorType));
+      }
       cmd.setEmbeddedFonts(false);
       if (isPassword) {
         cmd.setUserConnectionId(conn.user.id);