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 /sfx2 | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/Module_sfx2.mk | 2 | ||||
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 16742d29c416..5666825bf68a 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\ CppunitTest_sfx2_metadatable \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ JunitTest_sfx2_complex \ JunitTest_sfx2_unoapi \ diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index d7a60bfc9969..a8f1c8c6739e 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <tools/debug.hxx> #include <svl/eitem.hxx> @@ -344,7 +345,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU // ControllerItem is the Impl class if ( pControllerItem ) { -#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. The second parameter // indicates, that there shall only be one user notification (message box) @@ -366,7 +367,7 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::sta // ControllerItem is the Impl class if ( pControllerItem ) { -#ifdef SOLAR_JAVA +#if HAVE_FEATURE_JAVA // see comment for SfxOfficeDispatch::dispatch com::sun::star::uno::ContextLayer layer( new svt::JavaContext( com::sun::star::uno::getCurrentContext(), |