diff options
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/desktopcontext.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c11909f9edd9..d75b35238b49 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1689,7 +1689,7 @@ int Desktop::Main() try { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails com::sun::star::uno::ContextLayer layer2( diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 63ff6e1acd85..912314bbd3ec 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "desktopcontext.hxx" #include <vcl/svapp.hxx> @@ -40,7 +42,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim if ( Name == JAVA_INTERACTION_HANDLER_NAME ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) ); #endif } |