diff options
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/ConnectionPage.cxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/detailpages.cxx | 5 |
5 files changed, 18 insertions, 11 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 } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 77504d9d3d03..0f679b908027 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -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() ) diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index d46a3504bb8d..6564699e3cf8 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -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() ) diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 05b6bd961bce..8010d06f3852 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -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> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b396360b702d..c822b6de009e 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -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() ) |