优化：Windows环境下没有配置office.home，查找Office组件，内置的优先

fb6adf31 · 陈精华 · 0854317c · fb6adf31
Commit fb6adf31 authored Jul 06, 2021 by 陈精华
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

OfficeUtils.java ...ava/org/artofsolving/jodconverter/office/OfficeUtils.java +4 -4

No files found.
--- a/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
+++ b/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
@@ -87,10 +87,10 @@ public class OfficeUtils {
                programFiles = System.getenv("ProgramFiles");
            }
            return findOfficeHome(
-                programFiles + File.separator + "LibreOffice",
-                programFiles + File.separator + "OpenOffice 4",
-                programFiles + File.separator + "LibreOffice 4",
-                officePluginPath + File.separator + "windows-office"
+                    officePluginPath + File.separator + "windows-office",
+                    programFiles + File.separator + "LibreOffice",
+                    programFiles + File.separator + "OpenOffice 4",
+                    programFiles + File.separator + "LibreOffice 4"
            );
        } else if (PlatformUtils.isMac()) {
            return findOfficeHome(