diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:00:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:00:30 +0000 |
| commit | 4e37ebbd648572a1278d843054a1934ca8fe377f (patch) | |
| tree | ba2108dd9086b83b61ab1d39514cf24f2766d09d /desktop | |
| parent | 74cdfc01aea193b867da4bd4fc24b90e989ffa7c (diff) | |
INTEGRATION: CWS defaultbrowser (1.133.18); FILE MERGED
2004/04/27 07:22:59 obr 1.133.18.1: #i27120# moved the UNO context code out of javainteractionhandler and added desktop environment value
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 361c09925cf3..66853f3b413b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.134 $ + * $Revision: 1.135 $ * - * last change: $Author: obo $ $Date: 2004-04-29 16:29:43 $ + * last change: $Author: hr $ $Date: 2004-05-10 13:00:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,12 +70,12 @@ #include "dispatchwatcher.hxx" #include "ssoinit.hxx" #include "configinit.hxx" -#include "javainteractionhandler.hxx" #include "lockfile.hxx" #include "testtool.hxx" #include "checkinstall.hxx" #include "cmdlinehelp.hxx" #include "userinstall.hxx" +#include "desktopcontext.hxx" #ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_ #include <com/sun/star/frame/XStorable.hpp> @@ -1294,7 +1294,7 @@ void Desktop::Main() com::sun::star::uno::ContextLayer layer( com::sun::star::uno::getCurrentContext() ); com::sun::star::uno::setCurrentContext( - new JavaContext( com::sun::star::uno::getCurrentContext() ) ); + new DesktopContext( com::sun::star::uno::getCurrentContext() ) ); // ---- Startup screen ---- // OpenSplashScreen(); |