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/ui/dlg/DBSetupConnectionPages.cxx | |
parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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() ) |