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 /connectivity/inc | |
| 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 'connectivity/inc')
| -rw-r--r-- | connectivity/inc/connectivity/CommonTools.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index fa7ab752e32d..a2c4e60f149f 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -40,7 +40,10 @@ namespace com { namespace sun { namespace star { namespace util { struct Time; } }}} + +#ifdef SOLAR_JAVA namespace jvmaccess { class VirtualMachine; } +#endif namespace connectivity { @@ -157,7 +160,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); - +#ifdef SOLAR_JAVA /** creates a java virtual machine @param _rxContext The ORB. @@ -173,6 +176,7 @@ namespace connectivity The class name to look for. */ OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); +#endif } //================================================================================== |