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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 352a4fe2d928..11047ab1e8c7 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -355,6 +355,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU // ControllerItem is the Impl class if ( pControllerItem ) { +#ifdef SOLAR_JAVA // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails. The second parameter // indicates, that there shall only be one user notification (message box) @@ -364,7 +365,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU com::sun::star::uno::ContextLayer layer( new svt::JavaContext( com::sun::star::uno::getCurrentContext(), true) ); - +#endif pControllerItem->dispatch( aURL, aArgs, ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchResultListener >() ); } } @@ -376,11 +377,12 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::sta // ControllerItem is the Impl class if ( pControllerItem ) { +#ifdef SOLAR_JAVA // see comment for SfxOfficeDispatch::dispatch com::sun::star::uno::ContextLayer layer( new svt::JavaContext( com::sun::star::uno::getCurrentContext(), true) ); - +#endif pControllerItem->dispatch( aURL, aArgs, rListener ); } } |