summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2022-01-20 20:54:56 +0100
committerThorsten Behrens <thorsten.behrens@allotropia.de>2022-01-27 18:52:16 +0100
commit67478f9d637096781c9e3df64896b1ddaccc331b (patch)
tree09fde17b999d48faba4938ad6c1accccc79af38b /jvmfwk
parentc73670326ce5b571c31d43721729a05a11563b01 (diff)
Recheck modules [i-l]* with IWYU
See tdf#42949 for motivation Change-Id: I758bb27e93779e3df21c463714e49354748f446f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128715 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/inc/fwkutil.hxx1
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx1
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx2
-rw-r--r--jvmfwk/source/framework.cxx2
4 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/inc/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx
index e76a92769fc1..825355f42a47 100644
--- a/jvmfwk/inc/fwkutil.hxx
+++ b/jvmfwk/inc/fwkutil.hxx
@@ -22,7 +22,6 @@
#include <config_folders.h>
#include <sal/config.h>
-#include <sal/log.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/byteseq.hxx>
#include <osl/mutex.hxx>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 49157f033616..c420ad3f1581 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -21,6 +21,7 @@
#include "sunversion.hxx"
#include <osl/thread.h>
#include <rtl/character.hxx>
+#include <rtl/ustring.hxx>
#include <string.h>
namespace jfw_plugin { //stoc_javadetect
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 6d2def297d4d..27d2aebcc6bc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -24,8 +24,6 @@
#include <string_view>
-#include <rtl/ustring.hxx>
-
namespace jfw_plugin
{
/* SunVersion is used to compare java versions based on a string, as taken
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 200724b5483f..4163eea57b7c 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -26,8 +26,10 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
+#ifdef _WIN32
#include <osl/file.hxx>
#include <osl/process.h>
+#endif
#include <osl/thread.hxx>
#include <jvmfwk/framework.hxx>
#include <vendorbase.hxx>