diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
| commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
| tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /dbaccess/source/filter/xml | |
| parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) | |
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
Diffstat (limited to 'dbaccess/source/filter/xml')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
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) ) { |