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 /desktop | |
parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Library_migrationoo2.mk | 4 | ||||
-rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/desktopcontext.cxx | 4 | ||||
-rw-r--r-- | desktop/test/deployment/active/makefile.mk | 2 | ||||
-rw-r--r-- | desktop/unx/source/start.c | 7 |
5 files changed, 12 insertions, 7 deletions
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index c13485998d2f..e6ea8cf597d0 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ cppu \ cppuhelper \ i18nlangtag \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ jvmfwk) \ sal \ tl \ @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration $(eval $(call gb_Library_add_exception_objects,migrationoo2,\ desktop/source/migration/services/basicmigration \ desktop/source/migration/services/cexports \ - $(if $(filter TRUE,$(SOLAR_JAVA)), \ + $(if $(ENABLE_JAVA), \ desktop/source/migration/services/jvmfwk) \ desktop/source/migration/services/wordbookmigration \ )) 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 } diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk index 1c4fbbaaa7d9..baa79381e371 100644 --- a/desktop/test/deployment/active/makefile.mk +++ b/desktop/test/deployment/active/makefile.mk @@ -41,7 +41,7 @@ DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(ENABLE_JAVA)" != "" ALLTAR : $(MISC)/active.oxt diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index a488f955a319..645cae6844b0 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -6,6 +6,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include <config_features.h> + #include <signal.h> #include <unistd.h> #include <limits.h> @@ -636,7 +639,7 @@ exec_pagein (Args *args) free (argv[1]); } -#if defined SOLAR_JAVA +#if HAVE_FEATURE_JAVA static void extend_library_path (const char *new_element) { @@ -868,7 +871,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) exec_pagein (args); /* javaldx */ -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA if (!args->bInhibitJavaLdx) exec_javaldx (args); #endif |