From b7525f1f1d123084b60269f420300afdd405b0d1 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 4 Apr 2013 22:46:53 +0200
Subject: Drop jvmaccess and jvmfwk when no SOLAR_JAVA

Just sprinkle #ifdef SOLAR_JAVA into the code instead.

In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.

Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
---
 dbaccess/source/filter/xml/xmlfilter.cxx          | 6 ++++++
 dbaccess/source/ui/dlg/ConnectionPage.cxx         | 4 ++++
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 8 ++++++--
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx   | 2 ++
 dbaccess/source/ui/dlg/detailpages.cxx            | 5 ++++-
 5 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 2bb56799e722..96ea9ed860d9 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -22,7 +22,9 @@
 #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
 #include <jvmaccess/virtualmachine.hxx>
+#endif
 #include "xmlfilter.hxx"
 #include "flt_reghelper.hxx"
 #include <vcl/svapp.hxx>
@@ -104,6 +106,7 @@ namespace dbaxml
         {
             if ( m_eWhat == E_JAVA )
             {
+#ifdef SOLAR_JAVA
                 static bool s_bFirstTime = true;
                 if ( s_bFirstTime )
                 {
@@ -117,6 +120,7 @@ namespace dbaxml
                         OSL_ASSERT(0);
                     }
                 }
+#endif
             }
             else if ( m_eWhat == E_CALC )
             {
@@ -187,7 +191,9 @@ namespace dbaxml
 
                 if ( m_aTypeCollection.needsJVM(sURL) )
                 {
+#ifdef SOLAR_JAVA
                     pCreatorThread = new FastLoader(m_xContext, FastLoader::E_JAVA);
+#endif
                 }
                 else if ( sURL.matchIgnoreAsciiCaseAsciiL("sdbc:calc:",10,0) )
                 {
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 688b0890d6b1..77504d9d3d03 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -22,7 +22,9 @@
 #include "ConnectionPage.hrc"
 #include "dbu_dlg.hrc"
 #include "dsmeta.hxx"
+#ifdef SOLAR_JAVA
 #include <jvmaccess/virtualmachine.hxx>
+#endif
 #include <svl/itemset.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
@@ -315,6 +317,7 @@ namespace dbaui
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         sal_Bool bSuccess = sal_False;
+#ifdef SOLAR_JAVA
         try
         {
             if ( !m_aJavaDriver.GetText().isEmpty() )
@@ -326,6 +329,7 @@ namespace dbaui
         catch(Exception&)
         {
         }
+#endif
 
         const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 06584cfff7de..f1cfea4ef953 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -33,7 +33,9 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
+#ifdef SOLAR_JAVA
 #include <jvmaccess/virtualmachine.hxx>
+#endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
 #include "dbadmin.hxx"
@@ -552,6 +554,7 @@ DBG_NAME(OMySQLIntroPageSetup)
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
 
         sal_Bool bSuccess = sal_False;
+#ifdef SOLAR_JAVA
         try
         {
             if ( !m_aETDriverClass.GetText().isEmpty() )
@@ -564,7 +567,7 @@ DBG_NAME(OMySQLIntroPageSetup)
         catch(::com::sun::star::uno::Exception&)
         {
         }
-
+#endif
         const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
         OSQLMessageBox aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
@@ -672,6 +675,7 @@ DBG_NAME(OMySQLIntroPageSetup)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         sal_Bool bSuccess = sal_False;
+#ifdef SOLAR_JAVA
         try
         {
             if ( !m_aETDriverClass.GetText().isEmpty() )
@@ -684,7 +688,7 @@ DBG_NAME(OMySQLIntroPageSetup)
         catch(::com::sun::star::uno::Exception&)
         {
         }
-
+#endif
         sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         OSQLMessageBox aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() );
         aMsg.Execute();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 05d5485eec21..0d1dad07d5d9 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -34,7 +34,9 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
+#ifdef SOLAR_JAVA
 #include <jvmaccess/virtualmachine.hxx>
+#endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
 #include "dbadmin.hxx"
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 56780f8c0a19..b396360b702d 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -39,7 +39,9 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
+#ifdef SOLAR_JAVA
 #include <jvmaccess/virtualmachine.hxx>
+#endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
 #include "dbadmin.hxx"
@@ -622,6 +624,7 @@ namespace dbaui
         OSL_ENSURE(m_bUseClass,"Who called me?");
 
         sal_Bool bSuccess = sal_False;
+#ifdef SOLAR_JAVA
         try
         {
             if ( !m_aEDDriverClass.GetText().isEmpty() )
@@ -634,7 +637,7 @@ namespace dbaui
         catch(Exception&)
         {
         }
-
+#endif
         const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
         OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, mt );
-- 
cgit