Skip to content

S
slm-fileview
Commit fb6adf31 authored by 陈精华's avatar 陈精华
Browse files
Options

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

parent 0854317c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
View file @ fb6adf31
...@@ -87,10 +87,10 @@ public class OfficeUtils { ...@@ -87,10 +87,10 @@ public class OfficeUtils {
programFiles = System.getenv("ProgramFiles"); programFiles = System.getenv("ProgramFiles");
} }
return findOfficeHome( return findOfficeHome(
programFiles + File.separator + "LibreOffice", officePluginPath + File.separator + "windows-office",
programFiles + File.separator + "OpenOffice 4", programFiles + File.separator + "LibreOffice",
programFiles + File.separator + "LibreOffice 4", programFiles + File.separator + "OpenOffice 4",
officePluginPath + File.separator + "windows-office" programFiles + File.separator + "LibreOffice 4"
); );
} else if (PlatformUtils.isMac()) { } else if (PlatformUtils.isMac()) {
return findOfficeHome( return findOfficeHome(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment