Kaydet (Commit) 08452f12 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
üst a3b06ecf
......@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess \
jvmfwk) \
sal \
......
......@@ -118,7 +118,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
))
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
$(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
regmerge \
regview \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
......@@ -282,7 +282,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ira \
itg \
iti \
$(if $(SOLAR_JAVA),jdbc) \
$(if $(ENABLE_JAVA),jdbc) \
$(if $(ENABLE_KAB),kab1) \
$(if $(ENABLE_KAB),kabdrv1) \
ldapbe2 \
......@@ -438,16 +438,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno \
$(if $(SOLAR_JAVA),java_uno) \
$(if $(SOLAR_JAVA),juh) \
$(if $(SOLAR_JAVA),juhx) \
$(if $(SOLAR_JAVA),jvmaccess) \
$(if $(SOLAR_JAVA),jvmfwk) \
$(if $(ENABLE_JAVA),java_uno) \
$(if $(ENABLE_JAVA),juh) \
$(if $(ENABLE_JAVA),juhx) \
$(if $(ENABLE_JAVA),jvmaccess) \
$(if $(ENABLE_JAVA),jvmfwk) \
log_uno \
reg \
sal_textenc \
store \
$(if $(SOLAR_JAVA),sunjavaplugin) \
$(if $(ENABLE_JAVA),sunjavaplugin) \
unoidl \
unsafe_uno \
$(if $(URELIBS),urelibs) \
......@@ -463,8 +463,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \
introspection \
invocadapt \
invocation \
$(if $(SOLAR_JAVA),javaloader) \
$(if $(SOLAR_JAVA),javavm) \
$(if $(ENABLE_JAVA),javaloader) \
$(if $(ENABLE_JAVA),javavm) \
namingservice \
proxyfac \
reflection \
......@@ -498,7 +498,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
dict_zh \
embobj \
fileacc \
$(if $(SOLAR_JAVA),hsqldb) \
$(if $(ENABLE_JAVA),hsqldb) \
i18nlangtag \
i18nutil \
index_data \
......
......@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,accessibility,\
Library_acc \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,accessibility,\
CustomTarget_bridge \
......
......@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,apache-commons))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,apache-commons,\
ExternalPackage_apache_commons_logging \
......
......@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,bean))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(OS),MACOSX)
ifneq ($(OS),ANDROID)
......
......@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,beanshell))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter BSH,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,beanshell,\
ExternalPackage_beanshell \
......
......@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,bridges))
$(eval $(call gb_Module_add_targets,bridges,\
Library_cpp_uno \
$(if $(filter TRUE,$(SOLAR_JAVA)),\
$(if $(ENABLE_JAVA),\
Jar_java_uno \
Library_java_uno \
) \
......
......@@ -128,6 +128,7 @@ export ENABLE_GTK3=@ENABLE_GTK3@
export ENABLE_GTK=@ENABLE_GTK@
export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
export ENABLE_HEADLESS=@ENABLE_HEADLESS@
export ENABLE_JAVA=@ENABLE_JAVA@
export ENABLE_KAB=@ENABLE_KAB@
export ENABLE_KDE4=@ENABLE_KDE4@
export ENABLE_KDE=@ENABLE_KDE@
......@@ -458,7 +459,6 @@ export SOLARINC=@SOLARINC@
export SOLARLIB=@SOLARLIB@
export SOLARVER=@SOLARVER@
export SOLARVERSION=@SOLARVER@
export SOLAR_JAVA=@SOLAR_JAVA@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
export SRCDIR=@SRC_ROOT@
......
......@@ -7,6 +7,14 @@
#ifndef CONFIG_FEATURES_H
#define CONFIG_FEATURES_H
/* JAVA
*
* Whether we have support for Java extensions, and use own Java
* functionality).
*/
#define HAVE_FEATURE_JAVA 0
/* DESKTOP - Whether we have a "normal" desktop UI or not.
*
* Non-DESKTOP in practice means touch-based mobile devices, Android
......
......@@ -2439,35 +2439,29 @@ fi
AC_SUBST(ENABLE_LTO)
dnl ===================================================================
dnl Java support enable
dnl Java support
dnl ===================================================================
AC_MSG_CHECKING([whether to build with Java support])
if test "$with_java" != "no"; then
if test "$DISABLE_SCRIPTING" = TRUE; then
AC_MSG_RESULT([no, overridden by --disable-scripting])
SOLAR_JAVA=""
ENABLE_JAVA=""
with_java=no
else
AC_MSG_RESULT([yes])
SOLAR_JAVA="TRUE"
ENABLE_JAVA="TRUE"
AC_DEFINE(HAVE_FEATURE_JAVA)
fi
else
AC_MSG_RESULT([no])
SOLAR_JAVA=""
ENABLE_JAVA=""
fi
AC_SUBST(SOLAR_JAVA)
AC_SUBST(ENABLE_JAVA)
dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we
dnl want there to be *run-time* (and build-time) support for Java extensions in the
dnl built LibreOffice.
dnl ENABLE_JAVA="TRUE" if we want there to be *run-time* (and build-time) support for Java
dnl SOLAR_JAVA="BUILD" is claimed to indicate build-time only support
dnl (no runtime support). It doesn't seem to ever be set to this
dnl value, though, and everywhere SOLAR_JAVA is only checked for being
dnl empty or non-empty.
dnl SOLAR_JAVA="" indicate no java support at all
dnl ENABLE_JAVA="" indicate no Java support at all
dnl ===================================================================
dnl Test the Solaris compiler version
......@@ -2770,7 +2764,7 @@ if test $_os = Darwin; then
if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
AC_MSG_ERROR([OS X sandboxing requires code signing])
elif test -n "$SOLAR_JAVA" -a "$enable_macosx_sandbox" = yes; then
elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java])
elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
ENABLE_MACOSX_SANDBOX=YES
......@@ -6498,7 +6492,7 @@ AC_SUBST(MERGE_MODULES)
dnl ===================================================================
dnl Checks for Java
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
# Windows-specific tests
if test "$build_os" = "cygwin"; then
......@@ -6584,7 +6578,7 @@ dnl ===================================================================
# JAVA_HOME. Whether all the complexity here actually is needed any
# more or not, no idea.
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
_gij_longver=0
AC_MSG_CHECKING([the installed JDK])
if test -n "$JAVAINTERPRETER"; then
......@@ -6650,7 +6644,7 @@ fi
dnl ===================================================================
dnl Set target Java bytecode version
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
_java_target_ver="1.5"
JAVA_SOURCE_VER="$_java_target_ver"
......@@ -6660,7 +6654,7 @@ fi
dnl ===================================================================
dnl Checks for javac
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
if test "$JDK" = "gcj"; then
javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
else
......@@ -6698,7 +6692,7 @@ JAVACISGCJ=""
dnl ===================================================================
dnl Checks that javac is gcj
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then
JAVACISGCJ="yes"
fi
......@@ -6708,7 +6702,7 @@ AC_SUBST(JAVACISGCJ)
dnl ===================================================================
dnl Checks for javadoc
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
......@@ -6737,7 +6731,7 @@ if test "$SOLAR_JAVA" != ""; then
fi
AC_SUBST(JAVADOCISGJDOC)
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
......@@ -6841,7 +6835,7 @@ fi
AWTLIB=
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
AC_MSG_CHECKING([for jawt lib name])
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
......@@ -6891,7 +6885,7 @@ if test "$SOLAR_JAVA" != ""; then
fi
if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
if test -n "$ENABLE_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
#
# Determine JAVALIB
# If your platform follow the common pattern
......@@ -7167,7 +7161,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT"
test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread"
fi
elif test -z "$SOLAR_JAVA"; then
elif test -z "$ENABLE_JAVA"; then
x_JAVALIB=[\#]
x_JDKLIB=[\#]
fi
......@@ -11640,7 +11634,7 @@ libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarba
dnl ===================================================================
dnl Check for runtime JVM search path
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
if test -n "$with_jvm_path" -a "$with_jvm_path" != "no"; then
AC_MSG_RESULT([yes])
......@@ -11661,7 +11655,7 @@ dnl ===================================================================
dnl Test for the presence of Ant and that it works
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
if test "$ENABLE_JAVA" != ""; then
ANT_HOME=; export ANT_HOME
WITH_ANT_HOME=; export WITH_ANT_HOME
if test -z "$with_ant_home"; then
......@@ -11845,7 +11839,7 @@ EOF
fi
OOO_JUNIT_JAR=
if test "$SOLAR_JAVA" != "" -a "$with_junit" != "no"; then
if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
AC_MSG_CHECKING([for JUnit 4])
if test "$with_junit" = "yes"; then
if test -e /usr/share/java/junit4.jar; then
......@@ -12478,7 +12472,7 @@ else
case "$host_os" in
aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
pathmunge "$JAVA_HOME/bin" "after"
fi
;;
......@@ -12498,7 +12492,7 @@ else
pathmunge "$COMPATH/bin" "before"
pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
fi
if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
if test -d "$JAVA_HOME/jre/bin/client"; then
pathmunge "$JAVA_HOME/jre/bin/client" "before"
fi
......@@ -12511,7 +12505,7 @@ else
solaris*)
pathmunge "/usr/css/bin" "before"
if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
pathmunge "$JAVA_HOME/bin" "after"
fi
;;
......
......@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
cppu \
cppuhelper \
i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
sal \
salhelper \
......
......@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
cppuhelper \
sal \
salhelper \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
utl \
tl \
......
......@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_sdbc2 \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_hsqldb \
Configuration_jdbc \
......
......@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <stdio.h>
#include "connectivity/CommonTools.hxx"
......@@ -31,7 +32,7 @@
#include "TConnection.hxx"
#include <comphelper/types.hxx>
#include <com/sun/star/java/JavaVirtualMachine.hpp>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include <rtl/process.h>
......@@ -111,7 +112,7 @@ namespace connectivity
return ( *pStr == 0 ) && ( *pWild == 0 );
}
//------------------------------------------------------------------
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const Reference<XComponentContext >& _rxContext)
{
::rtl::Reference< jvmaccess::VirtualMachine > aRet;
......
......@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "cppu/EnvDcp.hxx"
......@@ -1056,7 +1057,7 @@ static bool loadEnv(OUString const & cLibStem,
if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
fpInit = CPPU_ENV_uno_initEnvironment;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
else if ( cLibStem == "java_uno" )
fpInit = java_uno_initEnvironment;
#endif
......
......@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "IdentityMapping.hxx"
......@@ -327,7 +328,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName )
{
if (rBridgeName.equalsAscii( CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ))
return CPPU_ENV_uno_ext_getMapping;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
if (rBridgeName.equalsAscii( "java" "_uno" ))
return java_uno_ext_getMapping;
#endif
......
......@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
drawinglayer \
editeng \
i18nlangtag \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmfwk) \
lng \
sal \
......
......@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "optjava.hxx"
#include <dialmgr.hxx>
......@@ -43,7 +45,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmfwk/framework.h>
#endif
......@@ -131,7 +133,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
: SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", rSet)
, m_pParamDlg(NULL)
, m_pPathDlg(NULL)
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
, m_parJavaInfo(NULL)
, m_parParameters(NULL)
, m_pClassPath(NULL)
......@@ -184,7 +186,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage, DialogClosedHdl ) );
EnableHdl_Impl(m_pJavaEnableCB);
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
jfw_lock();
#else
get<Window>("javaframe")->Disable();
......@@ -199,7 +201,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
delete m_pParamDlg;
delete m_pPathDlg;
ClearJavaInfo();
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
std::vector< JavaInfo* >::iterator pIter;
for ( pIter = m_aAddedInfos.begin(); pIter != m_aAddedInfos.end(); ++pIter )
{
......@@ -279,7 +281,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
Sequence< OUString > aParameterList;
if ( !m_pParamDlg )
{
......@@ -328,7 +330,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
String sClassPath;
if ( !m_pPathDlg )
......@@ -414,7 +416,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
void SvxJavaOptionsPage::ClearJavaInfo()
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
if ( m_parJavaInfo )
{
JavaInfo** parInfo = m_parJavaInfo;
......@@ -449,7 +451,7 @@ void SvxJavaOptionsPage::ClearJavaList()
void SvxJavaOptionsPage::LoadJREs()
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
WaitObject aWaitObj(m_pJavaList);
javaFrameworkError eErr = jfw_findAllJREs( &m_parJavaInfo, &m_nInfoSize );
if ( JFW_E_NONE == eErr && m_parJavaInfo )
......@@ -495,7 +497,7 @@ void SvxJavaOptionsPage::LoadJREs()
void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
OUStringBuffer sEntry;
sEntry.append('\t');
sEntry.append(_pInfo->sVendor);
......@@ -539,7 +541,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry )
void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
bool bStartAgain = true;
JavaInfo* pInfo = NULL;
javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo );
......@@ -649,7 +651,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
bModified = sal_True;
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
javaFrameworkError eErr = JFW_E_NONE;
if ( m_pParamDlg )
{
......@@ -745,7 +747,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
SvtMiscOptions aMiscOpt;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
sal_Bool bEnabled = sal_False;
javaFrameworkError eErr = jfw_getEnabled( &bEnabled );
if ( eErr != JFW_E_NONE )
......
......@@ -19,6 +19,8 @@
#ifndef _SVX_OPTJAVA_HXX
#define _SVX_OPTJAVA_HXX
#include <config_features.h>
#include <vector>
#include <ucbhelper/content.hxx>
#include <vcl/button.hxx>
......@@ -33,7 +35,7 @@
// forward ---------------------------------------------------------------
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
typedef struct _JavaInfo JavaInfo;
#else
typedef void* JavaInfo;
......@@ -59,7 +61,7 @@ private:
SvxJavaParameterDlg* m_pParamDlg;
SvxJavaClassPathDlg* m_pPathDlg;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
JavaInfo** m_parJavaInfo;
rtl_uString** m_parParameters;
rtl_uString* m_pClassPath;
......
......@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include "xmlfilter.hxx"
......@@ -105,7 +106,7 @@ namespace dbaxml
{
if ( m_eWhat == E_JAVA )
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
static bool s_bFirstTime = true;
if ( s_bFirstTime )
{
......@@ -190,7 +191,7 @@ namespace dbaxml
if ( m_aTypeCollection.needsJVM(sURL) )
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
pCreatorThread = new FastLoader(m_xContext, FastLoader::E_JAVA);
#endif
}
......
......@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "ConnectionPage.hxx"
#include "ConnectionPage.hrc"
#include "dbu_dlg.hrc"
#include "dsmeta.hxx"
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include <svl/itemset.hxx>
......@@ -317,7 +318,7 @@ namespace dbaui
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bSuccess = sal_False;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
try
{
if ( !m_aJavaDriver.GetText().isEmpty() )
......
......@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "DBSetupConnectionPages.hxx"
#include "sqlmessage.hxx"
#include "dbu_resource.hrc"
......@@ -33,7 +35,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include <connectivity/CommonTools.hxx>
......@@ -554,7 +556,7 @@ DBG_NAME(OMySQLIntroPageSetup)
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bSuccess = sal_False;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
try
{
if ( !m_aETDriverClass.GetText().isEmpty() )
......@@ -675,7 +677,7 @@ DBG_NAME(OMySQLIntroPageSetup)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bSuccess = sal_False;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
try
{
if ( !m_aETDriverClass.GetText().isEmpty() )
......
......@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "moduledbu.hxx"
#include "TextConnectionHelper.hxx"
#include "sqlmessage.hxx"
......@@ -34,7 +36,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include <connectivity/CommonTools.hxx>
......
......@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "detailpages.hxx"
#include "sqlmessage.hxx"
......@@ -39,7 +40,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
#include <jvmaccess/virtualmachine.hxx>
#endif
#include <connectivity/CommonTools.hxx>
......@@ -624,7 +625,7 @@ namespace dbaui
OSL_ENSURE(m_bUseClass,"Who called me?");
sal_Bool bSuccess = sal_False;
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
try
{
if ( !m_aEDDriverClass.GetText().isEmpty() )
......
......@@ -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,\