FIX #7118 fix command convert for mac (libreoffice required!)

modules/content_management/dist/src/MaarchCM.java

@@ -329,7 +329,7 @@ public class MaarchCM {
         return cookie;
     }
 
-    public void createPDF(String docxFile, String directory, boolean isUnix) {
+    public void createPDF(String docxFile, String directory, String os) {
         logger.log("createPDF ", Level.INFO);
         try {
             System.out.println("mode ! : " + editMode);
@@ -365,8 +365,10 @@ public class MaarchCM {
             String cmd = "";
             if (docxFile.contains(".odt") || docxFile.contains(".ods") || docxFile.contains(".ODT") || docxFile.contains(".ODS")) {
                 logger.log("This is opendocument ! ", Level.INFO);
-                if (isUnix) {
+                if (os == "linux") {
                     cmd = "libreoffice -env:UserInstallation=file://"+userLocalDirTmp+idApplet+"_conv/ --headless --convert-to pdf --outdir \"" + userLocalDirTmp.substring(0, userLocalDirTmp.length() - 1) + "\" \"" + docxFile + "\"";
+                } else if (os == "mac") {
+                    cmd = "cd /Applications/LibreOffice.app/Contents/MacOs && ./soffice --headless --convert-to pdf:writer_pdf_Export --outdir \"" + userLocalDirTmp.substring(0, userLocalDirTmp.length() - 1) + "\" \"" + docxFile + "\"";
                 } else {
                     String convertProgram;
                     convertProgram = fM.findPathProgramInRegistry("soffice.exe");
@@ -376,8 +378,10 @@ public class MaarchCM {
             } else if (docxFile.contains(".doc") || docxFile.contains(".docx") || docxFile.contains(".DOC") || docxFile.contains(".DOCX")) {
                 logger.log("This is MSOffice document ", Level.INFO);
                 if (useExeConvert.equals("false")) {
-                    if (isUnix) {
+                    if (os == "linux") {
                         cmd = "libreoffice -env:UserInstallation=file://"+userLocalDirTmp+idApplet+"_conv\\ --headless --convert-to pdf --outdir \"" + userLocalDirTmp.substring(0, userLocalDirTmp.length() - 1) + "\" \"" + docxFile + "\"";
+                    }  else if (os == "mac") {
+                        cmd = "cd /Applications/LibreOffice.app/Contents/MacOs && ./soffice --headless --convert-to pdf:writer_pdf_Export --outdir \"" + userLocalDirTmp.substring(0, userLocalDirTmp.length() - 1) + "\" \"" + docxFile + "\"";
                     } else if(editMode.equals("libreoffice")){
                         String convertProgram;
                         convertProgram = fM.findPathProgramInRegistry("soffice.exe");
@@ -402,7 +406,7 @@ public class MaarchCM {
                 FileManager fM = new FileManager();
 
                 Process proc_vbs;
-                if (isUnix) {
+                if (os == "linux" || os == "mac") {
                     //cmd = "cscript \""+vbsPath+"\" \""+docxFile+"\" /nologo \r\n";
                     final Writer outBat;
                     outBat = new OutputStreamWriter(new FileOutputStream(appPath_convert), "CP850");
@@ -690,7 +694,7 @@ public class MaarchCM {
                 if ((fileExtension.equalsIgnoreCase("docx") || fileExtension.equalsIgnoreCase("doc") || fileExtension.equalsIgnoreCase("docm") || fileExtension.equalsIgnoreCase("odt") || fileExtension.equalsIgnoreCase("ott"))) {
                     logger.log("----------CONVERSION PDF----------", Level.INFO);
                     
-                    createPDF(userLocalDirTmp + fileToEdit, userLocalDirTmp, isUnix);
+                    createPDF(userLocalDirTmp + fileToEdit, userLocalDirTmp, os);
 
                     String pdfFile = userLocalDirTmp + "thefile_" + idApplet + ".pdf";