mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Browse Source 
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
This commit is contained in:
Tor Lillqvist 2013-08-19 00:41:12 +03:00
parent a3b06ecf42
commit 08452f1208
105 changed files with 240 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library_merged.mk
View File

@ -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 \

22
Repository.mk
View File

@ -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 \

2
accessibility/Module_accessibility.mk
View File

@ -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 \

2
apache-commons/Module_apache-commons.mk
View File

@ -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 \

2
bean/Module_bean.mk
View File

@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,bean))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(OS),MACOSX)
ifneq ($(OS),ANDROID)

2
beanshell/Module_beanshell.mk
View File

@ -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 \

2
bridges/Module_bridges.mk
View File

@ -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 \
) \

2
config_host.mk.in
View File

@ -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@

8
config_host/config_features.h.in
View File

@ -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

56
configure.ac
View File

@ -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
;;

2
connectivity/CppunitTest_connectivity_commontools.mk
View File

@ -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 \

2
connectivity/Library_dbtools.mk
View File

@ -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 \

2
connectivity/Module_connectivity.mk
View File

@ -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 \

5
connectivity/source/commontools/CommonTools.cxx
View File

@ -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;

3
cppu/source/uno/lbenv.cxx
View File

@ -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

3
cppu/source/uno/lbmap.cxx
View File

@ -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

2
cui/Library_cui.mk
View File

@ -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 \

26
cui/source/options/optjava.cxx
View File

@ -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 )

6
cui/source/options/optjava.hxx
View File

@ -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;

7
dbaccess/source/filter/xml/xmlfilter.cxx
View File

@ -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
}

5
dbaccess/source/ui/dlg/ConnectionPage.cxx
View File

@ -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() )

8
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
View File

@ -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() )

4
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
View File

@ -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>

5
dbaccess/source/ui/dlg/detailpages.cxx
View File

@ -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() )

4
desktop/Library_migrationoo2.mk
View File

@ -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 \
))

2
desktop/source/app/app.cxx
View File

@ -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(

4
desktop/source/app/desktopcontext.cxx
View File

@ -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
}

2
desktop/test/deployment/active/makefile.mk
View File

@ -41,7 +41,7 @@ DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
.IF "$(SOLAR_JAVA)" != ""
.IF "$(ENABLE_JAVA)" != ""
ALLTAR : $(MISC)/active.oxt

7
desktop/unx/source/start.c
View File

@ -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

4
extensions/Library_pl.mk
View File

@ -25,12 +25,12 @@ $(eval $(call gb_Library_set_include,pl,\
$(eval $(call gb_Library_use_sdk_api,pl))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Library_add_defs,pl,\
-DOJI \
))
endif # SOLAR_JAVA=YES
endif # ENABLE_JAVA=YES
ifeq ($(SYSTEM_MOZILLA),YES)
$(eval $(call gb_Library_add_defs,pl,\

4
extensions/StaticLibrary_plugcon.mk
View File

@ -29,12 +29,12 @@ $(eval $(call gb_StaticLibrary_use_api,plugcon,\
udkapi \
))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_StaticLibrary_add_defs,plugcon,\
-DOJI \
))
endif # SOLAR_JAVA=YES
endif # ENABLE_JAVA=YES
ifeq ($(SYSTEM_MOZILLA),YES)
$(eval $(call gb_StaticLibrary_add_defs,plugcon,\

2
hsqldb/Module_hsqldb.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,hsqldb))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,hsqldb,\
ExternalPackage_hsqldb \
ExternalProject_hsqldb \

6
include/connectivity/CommonTools.hxx
View File

@ -19,6 +19,8 @@
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#define _CONNECTIVITY_COMMONTOOLS_HXX_
#include <config_features.h>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
@ -41,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace util {
}
}}}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
namespace jvmaccess { class VirtualMachine; }
#endif
@ -155,7 +157,7 @@ namespace connectivity
OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException );
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
/** creates a java virtual machine
@param _rxContext
The ORB.

5
include/uno/environment.h
View File

@ -261,12 +261,11 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
/* We link statically and have just the C++ environment */
void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env )
SAL_THROW_EXTERN_C();
#ifdef SOLAR_JAVA
/* We also have the Java environment */
/* We might also have the Java environment */
void SAL_CALL java_uno_initEnvironment( uno_Environment * Env )
SAL_THROW_EXTERN_C();
#endif
#endif
/** Gets a specific environment. If the specified environment does not exist, then a default one
is created and registered. The environment revokes itself on last release() call.

2
include/uno/mapping.h
View File

@ -194,14 +194,12 @@ void SAL_CALL CPPU_ENV_uno_ext_getMapping(
struct _uno_Environment * pTo )
SAL_THROW_EXTERN_C();
#ifdef SOLAR_JAVA
/* This is the uno_ext_getMapping function in the Java/UNO bridge */
void SAL_CALL java_uno_ext_getMapping(
struct _uno_Mapping ** ppMapping,
struct _uno_Environment * pFrom,
struct _uno_Environment * pTo )
SAL_THROW_EXTERN_C();
#endif
#endif

2
instsetoo_native/Package_rdb.mk
View File

@ -15,7 +15,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/ser
xml/services.rdb \
$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
$(if $(SOLAR_JAVA),\
$(if $(ENABLE_JAVA),\
$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),xml/scriptproviderforbeanshell.rdb) \
$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),xml/scriptproviderforjavascript.rdb) \
) \

2
javaunohelper/Module_javaunohelper.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,javaunohelper))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,javaunohelper,\
Library_juh \

2
jfreereport/Module_jfreereport.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,jfreereport))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,jfreereport,\
ExternalPackage_jfreereport_flow_engine \

2
jurt/Module_jurt.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,jurt))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,jurt,\
Jar_jurt \

2
jvmaccess/Module_jvmaccess.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,jvmaccess))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,jvmaccess,\
))

2
jvmfwk/Module_jvmfwk.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,jvmfwk))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,jvmfwk,\
Library_jvmfwk \

2
languagetool/Module_languagetool.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,languagetool))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,languagetool,\
ExternalProject_languagetool \

2
nlpsolver/Module_nlpsolver.mk
View File

@ -19,7 +19,7 @@
$(eval $(call gb_Module_Module,nlpsolver))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,nlpsolver,\
Jar_EvolutionarySolver \
Jar_nlpsolver \

4
odk/CustomTarget_check.mk
View File

@ -37,13 +37,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
) \
$(call gb_Package_get_target,odk_docs) \
$(call gb_Package_get_target,odk_html) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
$(call gb_Package_get_target,odk_lib) \
$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
$(call gb_Package_get_target,odk_uno_loader_classes) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg))
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
$(PERL) $< \

4
odk/CustomTarget_html.mk
View File

@ -23,8 +23,8 @@ $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html
-e 's|%DOXYGEN_PREFIX0%|$(if $(DOXYGEN),.,http://api.libreoffice.org)|g' \
-e 's|%DOXYGEN_PREFIX1%|$(if $(DOXYGEN),..,http://api.libreoffice.org)|g' \
-e 's|%DOXYGEN_PREFIX2%|$(if $(DOXYGEN),../..,http://api.libreoffice.org)|g' \
-e 's|%JAVADOC_PREFIX0%|$(if $(SOLAR_JAVA),.,http://api.libreoffice.org)|g' \
-e 's|%JAVADOC_PREFIX1%|$(if $(SOLAR_JAVA),..,http://api.libreoffice.org)|g' \
-e 's|%JAVADOC_PREFIX0%|$(if $(ENABLE_JAVA),.,http://api.libreoffice.org)|g' \
-e 's|%JAVADOC_PREFIX1%|$(if $(ENABLE_JAVA),..,http://api.libreoffice.org)|g' \
< $< > $@
# vim: set noet sw=4 ts=4:

2
odk/Module_odk.mk
View File

@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,odk,\
))
endif
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \

2
odk/util/check.pl
View File

@ -190,7 +190,7 @@ if (-d "$SdkDir") {
#check java docu, it is only a first and simple check
# improvement required
my $solar_java = $ENV{"SOLAR_JAVA"};
my $solar_java = $ENV{"ENABLE_JAVA"};
my $JDK = $ENV{"JDK"};
if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
print "check java docu: ";

4
postprocess/CustomTarget_images.mk
View File

@ -31,7 +31,7 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
$(call gb_Postprocess_get_target,AllResources) \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
@ -48,7 +48,7 @@ $(packimages_DIR)/%.zip : \
-l $(dir $(call gb_ResTarget_get_imagelist_target)) \
-l $(dir $(call gb_UIConfig_get_imagelist_target)) \
-l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))

2
postprocess/CustomTarget_registry.mk
View File

@ -333,7 +333,7 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
postprocess_DRIVERS += evoab
endif
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu

4
postprocess/Rdb_services.mk
View File

@ -139,7 +139,7 @@ $(eval $(call gb_Rdb_add_components,services,\
shell/source/win32/simplemail/smplmail \
shell/source/win32/syssh \
vcl/vcl.windows \
$(if $(SOLAR_JAVA), \
$(if $(ENABLE_JAVA), \
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
) \
) \
@ -229,7 +229,7 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_TDEAB), \
connectivity/source/drivers/kab/tdeab1 \
) \
$(if $(SOLAR_JAVA), \
$(if $(ENABLE_JAVA), \
xmerge/source/bridge/XMergeBridge \
scripting/java/ScriptFramework \
scripting/java/ScriptProviderForJava \

2
qadevOOo/Module_qadevOOo.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,qadevOOo))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,qadevOOo,\
Jar_OOoRunnerLight \
Jar_OOoRunner \

2
rhino/Module_rhino.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,rhino))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter RHINO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,rhino,\
ExternalPackage_rhino \

2
ridljar/Module_ridljar.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,ridljar))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,ridljar,\
CustomTarget_javamaker \
Jar_ridl \

4
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
View File

@ -202,10 +202,10 @@ namespace rtl_Bootstrap
{
Bootstrap aBootstrap;
rtl::OUString suValue;
rtl::OUString suValuename ("SOLAR_JAVA");
rtl::OUString suValuename ("ENABLE_JAVA");
//aBootstrap.getFrom( suValuename, suValue );
aBootstrap.getFrom( suValuename, suValue );
sal_Char * pStr = getenv("SOLAR_JAVA");
sal_Char * pStr = getenv("ENABLE_JAVA");
// printUString( suGetname );
CPPUNIT_ASSERT_MESSAGE("get the value of environment variable.", suValue.compareToAscii( pStr ) == 0 );
}

4
scp2/source/extensions/file_extensions.scp
View File

@ -224,7 +224,7 @@ End
/* ** Script provider for BeanShell ** */
#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
#if !defined SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
@ -243,7 +243,7 @@ End
/* ** Script provider for JavaScript ** */
#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
STD_JAR_FILE( gid_File_Jar_Js, js )

4
scp2/source/extensions/module_extensions.scp
View File

@ -255,7 +255,7 @@ End
/* ** Script provider for BeanShell ** */
#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
Module gid_Module_Optional_Extensions_Script_Provider_For_BS
PackageInfo = "packinfo_extensions.txt";
@ -274,7 +274,7 @@ End
/* ** Script provider for JavaScript ** */
#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
Module gid_Module_Optional_Extensions_Script_Provider_For_JS
PackageInfo = "packinfo_extensions.txt";

4
scp2/source/ooo/file_library_ooo.scp
View File

@ -26,7 +26,7 @@
************************************************************************/
#include "macros.inc"
#if defined SOLAR_JAVA && defined WNT
#if defined ENABLE_JAVA && defined WNT
File gid_File_Lib_Accessbridge
PACKED_LIB_FILE_BODY;
Name = "java_uno_accessbridge.dll";
@ -346,7 +346,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
#ifndef MACOSX
File gid_File_Lib_Officebean

16
scp2/source/ooo/file_ooo.scp
View File

@ -282,7 +282,7 @@ End
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
#ifndef MACOSX
@ -298,7 +298,7 @@ End
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
STD_JAR_FILE( gid_File_Jar_Report, report )
STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest )
STD_JAR_FILE( gid_File_Jar_Table, table )
@ -308,18 +308,18 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
#endif
#if defined SOLAR_JAVA && defined WNT
#if defined ENABLE_JAVA && defined WNT
STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
#ifndef SYSTEM_HSQLDB
STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
File gid_File_Jar_Commonwizards
TXT_FILE_BODY;
Name = JARFILENAME(commonwizards);
@ -328,12 +328,12 @@ File gid_File_Jar_Commonwizards
End
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
#endif
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
File gid_File_Jar_Unoil
TXT_FILE_BODY;
@ -526,7 +526,7 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd
Name (th) = "ctlseqcheck.xcd";
End
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
File gid_File_Scripts_Java
Dir = FILELIST_DIR;
TXT_FILE_BODY;

2
scp2/source/ooo/shortcut_ooo.scp
View File

@ -60,7 +60,7 @@ End
#ifdef MACOSX
#ifdef SOLAR_JAVA
#ifdef ENABLE_JAVA
// auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo)
Shortcut gid_Shortcut_Lib_Hsqldb_2

24
scp2/source/ooo/ure.scp
View File

@ -53,7 +53,7 @@ Directory gid_Dir_Ure_Share
End
#endif
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
Directory gid_Dir_Ure_Java
ParentID = SCP2_URE_SHARE_DIR;
DosName = "java";
@ -280,7 +280,7 @@ Unixlink gid_Unixlink_File_Dl_Store
Target = SCP2_URE_DL_VER("store", "3");
End
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
Unixlink gid_Unixlink_File_Dl_Jvmaccess
BIN_FILE_BODY;
@ -312,7 +312,7 @@ File gid_File_Dl_Profile_Jvmfwk3rc
End
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Dl_JrepropertiesClass
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@ -322,7 +322,7 @@ File gid_File_Dl_JrepropertiesClass
End
#endif
#if defined SOLAR_JAVA && defined MACOSX
#if defined ENABLE_JAVA && defined MACOSX
Unixlink gid_Unixlink_Dl_JavaUno
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@ -480,7 +480,7 @@ End
#endif
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Dl_Jpipe
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@ -490,7 +490,7 @@ File gid_File_Dl_Jpipe
End
#endif
#if defined SOLAR_JAVA && defined WNT
#if defined ENABLE_JAVA && defined WNT
File gid_File_Dl_Jpipx
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@ -567,7 +567,7 @@ End
// Public JARs:
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Java_UnoloaderJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
@ -577,7 +577,7 @@ File gid_File_Java_UnoloaderJar
End
#endif
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Java_JuhJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
@ -587,7 +587,7 @@ File gid_File_Java_JuhJar
End
#endif
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Java_JurtJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
@ -597,7 +597,7 @@ File gid_File_Java_JurtJar
End
#endif
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Java_RidlJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
@ -609,7 +609,7 @@ End
// Private JARs:
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Java_JavaUnoJar
TXT_FILE_BODY;
Dir = GID_DIR_URE_JAVA;
@ -639,7 +639,7 @@ End
// Private Miscellaneous Files:
#if defined SOLAR_JAVA
#if defined ENABLE_JAVA
File gid_File_Misc_JavavendorsXml
TXT_FILE_BODY;
Dir = GID_DIR_URE_SHARE_MISC;

6
scp2/source/sdkoo/sdkoo.scp
View File

@ -160,7 +160,7 @@ File gid_File_Package_odk_html
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#if defined(SOLAR_JAVA)
#if defined(ENABLE_JAVA)
File gid_File_Package_odk_javadoc
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
@ -199,7 +199,7 @@ File gid_File_Package_odk_settings_generated
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#if defined(SOLAR_JAVA)
#if defined(ENABLE_JAVA)
File gid_File_Package_odk_unowinreg
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
@ -245,7 +245,7 @@ File gid_File_Zip_Odkheaders
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#if defined(SOLAR_JAVA)
#if defined(ENABLE_JAVA)
File gid_File_Zip_uno_loader_classes
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;

2
scripting/Module_scripting.mk
View File

@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,scripting))
ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,scripting,\
$(if $(SOLAR_JAVA),\
$(if $(ENABLE_JAVA),\
Jar_HelloWorld \
Jar_Highlight \
Jar_MemoryUsage \

2
sfx2/Module_sfx2.mk
View File

@ -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 \

5
sfx2/source/control/unoctitm.cxx
View File

@ -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(),

4
smoketest/Module_smoketest.mk
View File

@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\
Zip_smoketestdoc \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,smoketest,\
Extension_TestExtension \
Jar_TestExtension \
@ -40,7 +40,7 @@ endif
endif
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,smoketest,\
Jar_smoketest \
))

2
smoketest/data/Basic/Standard/Global.xml
View File

@ -613,7 +613,7 @@ Sub SetDefaultOptions
bMakeHTMLTest = true
bMakeMathTest = true
bMakeChartTest = true
if Environ(&quot;SOLAR_JAVA&quot;) = &quot;&quot; then
if Environ(&quot;ENABLE_JAVA&quot;) = &quot;&quot; then
bMakeJavaTest = false
bMakeDBTest = false
bMakeExtensionTest = false

1
solenv/gbuild/InstallModuleTarget.mk
View File

@ -70,6 +70,7 @@ $(call gb_Helper_abbreviate_dirs,\
-+ -P \
$(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
$(if $(ENABLE_JAVA),-DENABLE_JAVA) \
$(SCP_SOURCE) > $(1) \
)
endef

8
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@ -46,7 +46,7 @@ gb_EXTRAMERGEDLIBS := \
fwm \
graphicfilter \
guesslang \
$(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \
$(if $(ENABLE_JAVA),hsqldb) \
hyphen \
icd \
icg \
@ -60,7 +60,7 @@ gb_EXTRAMERGEDLIBS := \
ira \
itg \
iti \
$(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \
$(if $(ENABLE_JAVA),jdbc) \
$(if $(filter-out ANDROID IOS,$(OS)),ldapbe2) \
lnth \
$(if $(filter-out ANDROID IOS,$(OS)),log) \
@ -166,8 +166,8 @@ gb_URELIBS := \
cppu \
cppuhelper \
introspection \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
$(if $(ENABLE_JAVA),jvmaccess) \
$(if $(ENABLE_JAVA),jvmfwk) \
reflection \
reg \
sal \

4
solenv/gbuild/gbuild.mk
View File

@ -225,10 +225,6 @@ gb_GLOBALDEFS += -D_DEBUG
endif
endif
ifneq ($(strip $(SOLAR_JAVA)),)
gb_GLOBALDEFS += -DSOLAR_JAVA
endif
ifeq ($(gb_TIMELOG),1)
gb_GLOBALDEFS += -DTIMELOG \

1
solenv/gbuild/platform/IOS_ARM_GCC.mk
View File

@ -229,7 +229,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_OSDEFS) \
-DCOMID=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/gbuild/platform/com_MSC_class.mk
View File

@ -510,7 +510,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=MSC \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/gbuild/platform/macosx.mk
View File

@ -334,7 +334,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_OSDEFS) \
-DCOMID=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/gbuild/platform/mingw.mk
View File

@ -342,7 +342,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_OSDEFS) \
-DCOMID=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/gbuild/platform/solaris.mk
View File

@ -364,7 +364,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/gbuild/platform/unxgcc.mk
View File

@ -361,7 +361,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
-DSHORTSTDC3=$(gb_SHORTSTDC3) \
-DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
endef

1
solenv/inc/doxygen.cfg
View File

@ -1605,7 +1605,6 @@ PREDEFINED = LINUX \
DBG_UTIL \
OSL_DEBUG_LEVEL=2 \
CUI \
SOLAR_JAVA \
EXCEPTIONS_ON
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then

2
stoc/Module_stoc.mk
View File

@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,stoc,\
Library_stocservices \
))
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,stoc,\
Library_javaloader \

2
svl/Library_svl.mk
View File

@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,svl,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmfwk) \
sal \
sot \

2
svtools/AllLangResTarget_svt.mk
View File

@ -46,7 +46,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/dialogs/formats.src \
svtools/source/dialogs/so3res.src \
svtools/source/dialogs/wizardmachine.src \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
svtools/source/java/javaerror.src) \
svtools/source/misc/ehdl.src \
svtools/source/misc/imagemgr.src \

4
svtools/Library_svt.mk
View File

@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,svt,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmfwk) \
salhelper \
sal \
@ -159,7 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/graphic/provider \
svtools/source/graphic/renderer \
svtools/source/graphic/transformer \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
svtools/source/java/javacontext \
svtools/source/java/javainteractionhandler) \
svtools/source/misc/acceleratorexecute \

4
sw/inc/SwAppletImpl.hxx
View File

@ -20,6 +20,8 @@
#ifndef _SW_APPLET_IMPL_HXX
#define _SW_APPLET_IMPL_HXX
#include <config_features.h>
#define SWHTML_OPTTYPE_IGNORE 0
#define SWHTML_OPTTYPE_TAG 1
#define SWHTML_OPTTYPE_PARAM 2
@ -55,7 +57,7 @@ public:
void CreateApplet( const OUString& rCode, const OUString& rName,
sal_Bool bMayScript, const OUString& rCodeBase,
const OUString& rBaseURL );
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
sal_Bool CreateApplet( const OUString& rBaseURL );
void AppendParam( const OUString& rName, const OUString& rValue );
#endif

4
sw/source/filter/html/SwAppletImpl.cxx
View File

@ -147,7 +147,7 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
xSet->setPropertyValue("AppletCodeBase", uno::makeAny( sDocBase ) );
}
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
{
OUString aCode, aName, aCodeBase;
@ -189,7 +189,7 @@ void SwApplet_Impl::FinishApplet()
}
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue )
{
aCommandList.Append( rName, rValue );

14
sw/source/filter/html/htmlplug.cxx
View File

@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "hintids.hxx"
#include <rtl/strbuf.hxx>
#include <svl/urihelper.hxx>
@ -484,7 +486,7 @@ void SwHTMLParser::InsertEmbed()
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
void SwHTMLParser::NewObject()
{
String aClassID, aName, aStandBy, aId, aStyle, aClass;
@ -624,7 +626,7 @@ void SwHTMLParser::NewObject()
void SwHTMLParser::EndObject()
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
if( !pAppletImpl )
return;
if( pAppletImpl->CreateApplet( sBaseURL ) )
@ -654,7 +656,7 @@ void SwHTMLParser::EndObject()
#endif
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
void SwHTMLParser::InsertApplet()
{
String aCodeBase, aCode, aName, aAlt, aId, aStyle, aClass;
@ -757,7 +759,7 @@ void SwHTMLParser::InsertApplet()
void SwHTMLParser::EndApplet()
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
if( !pAppletImpl )
return;
@ -787,7 +789,7 @@ void SwHTMLParser::EndApplet()
void SwHTMLParser::InsertParam()
{
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
if( !pAppletImpl )
return;
@ -968,7 +970,7 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
{
eType = HTML_FRMTYPE_IFRAME;
}
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
else if( aClass == SvGlobalName( SO3_APPLET_CLASSID ) )
{
eType = HTML_FRMTYPE_APPLET;

6
sw/source/filter/html/swhtml.cxx
View File

@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@ -1374,14 +1376,14 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_OBJECT_ON:
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
NewObject();
bCallNextToken = pAppletImpl!=0 && pTable!=0;
#endif
break;
case HTML_APPLET_ON:
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
InsertApplet();
bCallNextToken = pAppletImpl!=0 && pTable!=0;
#endif

6
sw/source/filter/html/swhtml.hxx
View File

@ -19,6 +19,8 @@
#ifndef _SWHTML_HXX
#define _SWHTML_HXX
#include <config_features.h>
#include <sfx2/sfxhtml.hxx>
#include <svl/macitem.hxx>
#include <editeng/svxenum.hxx>
@ -705,11 +707,11 @@ private:
void InsertImage(); // htmlgrin.cxx
void InsertEmbed(); // htmlplug.cxx
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
void NewObject(); // htmlplug.cxx
#endif
void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx)
#ifdef SOLAR_JAVA
#if HAVE_FEATURE_JAVA
void InsertApplet(); // htmlplug.cxx
#endif
void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx)

2
testtools/CustomTarget_bridgetest.mk
View File

@ -20,7 +20,7 @@ endif
$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
$(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
$(if $(SOLAR_JAVA),\
$(if $(ENABLE_JAVA),\
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))

2
testtools/Module_testtools.mk
View File

@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,testtools,\
Rdb_uno_services \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
Jar_testComponent \
CustomTarget_bridgetest_javamaker \

2
testtools/Rdb_uno_services.mk
View File

@ -15,7 +15,7 @@ $(eval $(call gb_Rdb_add_components,uno_services,\
testtools/source/bridgetest/bridgetest \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Rdb_add_components,uno_services,\
testtools/source/bridgetest/testComponent \
))

2
testtools/com/sun/star/comp/bridge/makefile.mk
View File

@ -27,7 +27,7 @@ TARGET=com_sun_star_comp_bridge
# ------------------------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
.IF "$(ENABLE_JAVA)" != ""
JARFILES = ridl.jar jurt.jar juh.jar

2
tomcat/Module_tomcat.mk
View File

@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,tomcat))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
ifneq ($(filter TOMCAT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,tomcat,\
ExternalProject_tomcat \

2
unoil/Module_unoil.mk
View File

@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,unoil,\
Package_clioootypesversion \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,unoil,\
CustomTarget_javamaker \
Jar_unoil \

2
unotest/Module_unotest.mk
View File

@ -18,7 +18,7 @@ $(eval $(call gb_Module_add_targets,unotest,\
))
endif
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,unotest,\
Jar_test-tools \
))

2
ure/Rdb_ure.mk
View File

@ -28,7 +28,7 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
remotebridges/source/unourl_resolver/uuresolver \
))
ifneq ($(SOLAR_JAVA),)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Rdb_add_components,ure/services,\
stoc/source/javaloader/javaloader \
stoc/source/javavm/javavm \

2
vcl/Library_desktop_detector.mk
View File

@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

2
vcl/Library_vcl.mk
View File

@ -84,7 +84,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
))
endif
ifeq ($(SOLAR_JAVA),TRUE)
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_Library_use_libraries,vcl,\
jvmaccess \
))

2
vcl/Library_vclplug_gen.mk
View File

@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

2
vcl/Library_vclplug_gtk.mk
View File

@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

2
vcl/Library_vclplug_gtk3.mk
View File

@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

2
vcl/Library_vclplug_kde.mk
View File

@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

2
vcl/Library_vclplug_kde4.mk
View File

@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
cppuhelper \
i18nlangtag \
i18nutil \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
$(if $(ENABLE_JAVA), \
jvmaccess) \
cppu \
sal \

Some files were not shown because too many files have changed in this diff Show More