Bug #4346 : fixing problem introduced for libreOffice

Author: Emmanuel Hugonnet

src/main/java/org/silverpeas/openoffice/OfficeFinder.java

@@ -21,11 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package org.silverpeas.openoffice;
 
 /**

src/main/java/org/silverpeas/openoffice/OfficeLauncher.java

@@ -58,20 +58,26 @@ public class OfficeLauncher {
   public static int launch(MsOfficeType type, String url, AuthenticationInfo authInfo,
       boolean useDeconnectedMode) throws IOException, InterruptedException, OfficeNotFoundException {
     OfficeFinder finder = FinderFactory.getFinder(type);
-    logger.log(Level.INFO, "Are we using Office : {0}", finder.isMicrosoftOffice());
     logger.log(Level.INFO, "We are on {0} OS", OsEnum.getOS());
+    String webdavUrl = url;
     boolean modeDisconnected = ((OsEnum.isWindows() && useDeconnectedMode) || OsEnum.getOS()
         == OsEnum.MAC_OSX) && finder.isMicrosoftOffice();
+    if (!modeDisconnected) {
+      if (finder.isMicrosoftOffice() && (OsEnum.getOS() == OsEnum.WINDOWS_XP || (OsEnum
+          .isWindows() && MsOfficeVersion.isOldOffice(type)))) {
+        webdavUrl = webdavUrl.replace("/repository/", "/repository2000/");
+      }
+    }
     switch (type) {
       case EXCEL:
-        return launch(type, finder.findSpreadsheet(), url, modeDisconnected, authInfo);
+        return launch(type, finder.findSpreadsheet(), webdavUrl, modeDisconnected, authInfo);
       case POWERPOINT:
-        return launch(type, finder.findPresentation(), url, modeDisconnected, authInfo);
+        return launch(type, finder.findPresentation(), webdavUrl, modeDisconnected, authInfo);
       case WORD:
-        return launch(type, finder.findWordEditor(), url, modeDisconnected, authInfo);
+        return launch(type, finder.findWordEditor(), webdavUrl, modeDisconnected, authInfo);
       case NONE:
       default:
-        return launch(type, finder.findOther(), url, modeDisconnected, authInfo);
+        return launch(type, finder.findOther(), webdavUrl, modeDisconnected, authInfo);
     }
   }
 
@@ -90,7 +96,6 @@ protected static int launch(MsOfficeType type, String path, String url, boolean
       AuthenticationInfo auth) throws IOException, InterruptedException {
     logger.log(Level.INFO, "The path: {0}", path);
     logger.log(Level.INFO, "The url: {0}", url);
-    logger.log(Level.INFO, "The command line: {0} {1}", new Object[]{path, url});
     if (modeDisconnected) {
       try {
         String webdavUrl = url;
@@ -114,13 +119,8 @@ protected static int launch(MsOfficeType type, String path, String url, boolean
       }
     } else {
       // Standard mode : just open it
-      String webdavUrl = url;
-      if (OsEnum.getOS() == OsEnum.WINDOWS_XP || (OsEnum.isWindows() && MsOfficeVersion.isOldOffice(
-          type))) {
-        webdavUrl = webdavUrl.replace("/repository/", "/repository2000/");
-      }
-      logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[]{path, webdavUrl});
-      Process process = Runtime.getRuntime().exec(path + ' ' + webdavUrl);
+      logger.log(Level.INFO, "The exact exec line: {0} {1}", new Object[]{path, url});
+      Process process = Runtime.getRuntime().exec(path + ' ' + url);
       return process.waitFor();
     }
   }

src/main/java/org/silverpeas/openoffice/OpenOfficeFinder.java

@@ -21,11 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package org.silverpeas.openoffice;
 
 /**