summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-05-06 00:33:23 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-05-16 09:40:07 +0200
commit2d22f8bb15c12752f6c763cde330d255d8be9545 (patch)
tree95d2a76a26e236d31fd0bbaef57b128c09526395
parentf897342320ad3a29cf4be1437c8e3ce888bdb3cb (diff)
tdf#42949 Fix IWYU warnings in javaunohelper/
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I16c46b6640a349b886fe934f5634f2ba79d64887 Reviewed-on: https://gerrit.libreoffice.org/71934 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--javaunohelper/IwyuFilter_javaunohelper.yaml16
-rw-r--r--javaunohelper/source/bootstrap.cxx4
-rw-r--r--javaunohelper/source/javaunohelper.cxx4
3 files changed, 17 insertions, 7 deletions
diff --git a/javaunohelper/IwyuFilter_javaunohelper.yaml b/javaunohelper/IwyuFilter_javaunohelper.yaml
new file mode 100644
index 000000000000..59a93f4a7801
--- /dev/null
+++ b/javaunohelper/IwyuFilter_javaunohelper.yaml
@@ -0,0 +1,16 @@
+---
+assumeFilename: javaunohelper/source/vm.cxx
+blacklist:
+ javaunohelper/source/bootstrap.cxx:
+ # Needed for direct member access
+ - com/sun/star/uno/XComponentContext.hpp
+ - jvmaccess/unovirtualmachine.hxx
+ # Needed to avoid loplugin:unreffun error
+ - juhx-export-functions.hxx
+ javaunohelper/source/javaunohelper.cxx:
+ # Needed for direct member access
+ - com/sun/star/lang/XMultiServiceFactory.hpp
+ - com/sun/star/registry/XRegistryKey.hpp
+ - jvmaccess/unovirtualmachine.hxx
+ # Needed to avoid loplugin:unreffun error
+ - juhx-export-functions.hxx
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 8d593ce54112..e7bf63b841de 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -22,7 +22,6 @@
#include <osl/diagnose.h>
-#include <rtl/alloc.h>
#include <rtl/bootstrap.hxx>
#include <rtl/string.hxx>
@@ -33,10 +32,9 @@
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <jni.h>
-#include <jvmaccess/virtualmachine.hxx>
#include <jvmaccess/unovirtualmachine.hxx>
#include <tools/diagnose_ex.h>
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 43c385bed20a..6d4b9907fd30 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <osl/module.hxx>
-#include <osl/thread.h>
#include <uno/environment.hxx>
#include <uno/lbnames.h>
@@ -28,13 +27,10 @@
#include <cppuhelper/factory.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <jni.h>
-#include <jvmaccess/virtualmachine.hxx>
#include <jvmaccess/unovirtualmachine.hxx>
#include "juhx-export-functions.hxx"