diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 00:41:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 10:29:04 +0300 |
| commit | 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch) | |
| tree | fb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /vcl/source | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/syschild.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
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; |