From b7525f1f1d123084b60269f420300afdd405b0d1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist 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 --- desktop/source/app/app.cxx | 3 ++- desktop/source/app/desktopcontext.cxx | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'desktop/source') 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() ) { -- cgit v1.2.3