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 /dbaccess/source/filter/xml/xmlfilter.cxx | |
parent | callcatcher: remove some more unused code (diff) | |
download | core-08452f1208a2ecbf7c6f15a96efeedbe5210ec83.tar.gz core-08452f1208a2ecbf7c6f15a96efeedbe5210ec83.zip |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'dbaccess/source/filter/xml/xmlfilter.cxx')
-rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 3460427a7a45..915d597c7d47 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -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 } |