Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 97fb391

Browse files
author
Emmanuel Hugonnet
committed
Bug #4597: fixing bufg by adding correct support for Windows 8.
1 parent 7155001 commit 97fb391

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

src/main/java/org/silverpeas/openoffice/util/OsEnum.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public static OsEnum getOS() {
6060

6161
public static boolean isWindows() {
6262
OsEnum currentOS = getOS();
63-
return currentOS == WINDOWS_SEVEN || currentOS == WINDOWS_XP || currentOS == WINDOWS_VISTA;
63+
return currentOS == WINDOWS_SEVEN || currentOS == WINDOWS_XP || currentOS == WINDOWS_VISTA
64+
|| currentOS == WINDOWS_8;
6465
}
6566

6667
public static boolean isLinux() {

src/main/java/org/silverpeas/openoffice/windows/MsOfficePathFinder.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
/**
22
* Copyright (C) 2000 - 2009 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify
5-
* it under the terms of the GNU Affero General Public License as
6-
* published by the Free Software Foundation, either version 3 of the
7-
* License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify it under the terms of the
5+
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6+
* of the License, or (at your option) any later version.
87
*
9-
* As a special exception to the terms and conditions of version 3.0 of
10-
* the GPL, you may redistribute this Program in connection with Free/Libre
11-
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12-
* FLOSS exception. You should have received a copy of the text describing
13-
* the FLOSS exception, and it is also available here:
8+
* As a special exception to the terms and conditions of version 3.0 of the GPL, you may
9+
* redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
10+
* applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
11+
* text describing the FLOSS exception, and it is also available here:
1412
* "http://repository.silverpeas.com/legal/licensing"
1513
*
16-
* This program is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU Affero General Public License for more details.
14+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
15+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
* Affero General Public License for more details.
2017
*
21-
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
* You should have received a copy of the GNU Affero General Public License along with this program.
19+
* If not, see <http://www.gnu.org/licenses/>.
2320
*/
2421

2522
/*
@@ -28,10 +25,11 @@
2825
*/
2926
package org.silverpeas.openoffice.windows;
3027

28+
import java.io.File;
29+
3130
import org.silverpeas.openoffice.OfficeFinder;
3231
import org.silverpeas.openoffice.OfficeNotFoundException;
3332
import org.silverpeas.openoffice.OpenOfficeFinder;
34-
import java.io.File;
3533

3634
/**
3735
* @author ehugonnet

src/main/java/org/silverpeas/openoffice/windows/MsOfficeVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public enum MsOfficeVersion {
3535

3636
Office95(7), Office97(8), Office2000(9), OfficeXP(10), Office2003(11),
37-
Office2007(12), Office2010(14);
37+
Office2007(12), Office2010(14), Office2013(15);
3838
private final int numeralVersion;
3939

4040
private MsOfficeVersion(int numeralVersion) {

0 commit comments

Comments
 (0)