解决tar包office目录层级过长问题

This commit is contained in:
陈精华
2019-04-15 16:50:53 +08:00
committed by kl
parent 9976f0ae99
commit 6dc10e8df4
3610 changed files with 16 additions and 14 deletions

View File

@@ -66,8 +66,7 @@ public class OfficeUtils {
}
if (PlatformUtils.isWindows()) {
// %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
String separator = File.separator;
String officeHome = OfficeUtils.getHomePath() + separator + "office";
String homePath = OfficeUtils.getHomePath();
String programFiles = System.getenv("ProgramFiles(x86)");
if (programFiles == null) {
programFiles = System.getenv("ProgramFiles");
@@ -75,7 +74,7 @@ public class OfficeUtils {
return findOfficeHome(
programFiles + File.separator + "OpenOffice 4",
programFiles + File.separator + "LibreOffice 4",
officeHome + File.separator + "OpenOffice 4"
homePath + File.separator + "office"
);
} else if (PlatformUtils.isMac()) {
return findOfficeHome(