diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 12:19:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 12:19:39 +0000 |
| commit | 196946e0383db12b1fac939256fc180cca23af3e (patch) | |
| tree | 177e5173b40c91882cb52a078463ee0ec27a7894 | |
| parent | ff380cf8803a9afe0ad451cebbed1e28b8024f73 (diff) | |
INTEGRATION: CWS jl22 (1.179.16); FILE MERGED
2005/06/16 14:34:10 jl 1.179.16.1: #i37020# The JavaInterceptionHandler and JavaContext moved to svtools/source/java, because it is also used from several projects. Currently these are desktop and sfx
| -rw-r--r-- | desktop/source/app/app.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 2cd9427ac8a8..49b045f993b4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.179 $ + * $Revision: 1.180 $ * - * last change: $Author: rt $ $Date: 2005-05-24 13:39:27 $ + * last change: $Author: obo $ $Date: 2005-07-07 13:19:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,8 @@ #include "userinstall.hxx" #include "desktopcontext.hxx" #include "exithelper.hxx" -#include "javainteractionhandler.hxx" + +#include <svtools/javacontext.hxx> #ifndef _COM_SUN_STAR_FRAME_XSESSIONMANAGERLISTENER_HPP_ #include <com/sun/star/frame/XSessionManagerListener.hpp> @@ -1690,7 +1691,7 @@ void Desktop::Main() // The JavaContext contains an interaction handler which is used when // the creation of a Java Virtual Machine fails com::sun::star::uno::ContextLayer layer( - new JavaContext( com::sun::star::uno::getCurrentContext() ) ); + new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) ); Execute(); } |