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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/Library_migrationoo2.mk | 6 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/app/desktopcontext.cxx | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index f624d18b83f3..89b73d3bb43f 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -35,7 +35,8 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ cppu \ cppuhelper \ i18nisolang1 \ - jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmfwk) \ sal \ tl \ utl \ @@ -47,7 +48,8 @@ $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration $(eval $(call gb_Library_add_exception_objects,migrationoo2,\ desktop/source/migration/services/basicmigration \ desktop/source/migration/services/cexports \ - desktop/source/migration/services/jvmfwk \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + desktop/source/migration/services/jvmfwk) \ desktop/source/migration/services/wordbookmigration \ )) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 32c8b558caca..96809e70caaa 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1719,11 +1719,12 @@ int Desktop::Main() try { +#ifdef SOLAR_JAVA // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails com::sun::star::uno::ContextLayer layer2( new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) ); - +#endif // check whether the shutdown is caused by restart just before entering the Execute pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || xRestartManager->isRestartRequested(true); diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 032078602046..26cd03bcd5e8 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -41,7 +41,9 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim if ( Name == JAVA_INTERACTION_HANDLER_NAME ) { +#ifdef SOLAR_JAVA retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) ); +#endif } else if( m_xNextContext.is() ) { |