Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3

10 files changed, 16 insertions, 15 deletions

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 132615108acd..6baf4abcb346 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9dc7e7ec119f..363f82a6303d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -84,7 +84,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
 ))
 endif
 
-ifeq ($(SOLAR_JAVA),TRUE)
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Library_use_libraries,vcl,\
     jvmaccess \
 ))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index c32b3f46ee30..64d2c0175606 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index e870d0611181..db2dd21c3eb8 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 5cd310f50603..6b35be09fbf0 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 7ebfdc75a713..40b5800db635 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index a192987bb9ca..c72fe004d727 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 43a311d9a690..08f5c0892404 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 0480978a66a0..74551bdee907 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+    $(if $(ENABLE_JAVA), \
         jvmaccess) \
     cppu \
     sal \
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 0a98fc2f4b57..9f328b6298b7 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include <rtl/process.h>
 #include <rtl/ref.hxx>
@@ -37,13 +38,13 @@
 #include <salobj.hxx>
 #include <svdata.hxx>
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 #include <jni.h>
 #endif
 
 #include <comphelper/processfactory.hxx>
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 #include <jvmaccess/virtualmachine.hxx>
 #include <com/sun/star/java/JavaVirtualMachine.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -176,7 +177,7 @@ void SystemChildWindow::EnableEraseBackground( sal_Bool bEnable )
 
 void SystemChildWindow::ImplTestJavaException( void* pEnv )
 {
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     JNIEnv*     pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv );
     jthrowable  jtThrowable = pJavaEnv->ExceptionOccurred();
 
@@ -203,7 +204,7 @@ void SystemChildWindow::ImplTestJavaException( void* pEnv )
     }
 #else
     (void)pEnv;
-#endif // SOLAR_JAVA
+#endif // HAVE_FEATURE_JAVA
 }
 
 void SystemChildWindow::SetForwardKey( sal_Bool bEnable )
@@ -233,7 +234,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
     {
         nRet = (sal_IntPtr) GetSystemData()->aWindow;
     }
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     else
     {
         uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
@@ -313,7 +314,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
             }
         }
     }
-#endif // SOLAR_JAVA
+#endif // HAVE_FEATURE_JAVA
 #endif
 
     return nRet;