strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS os9 (1.106.2); FILE MERGED

Browse source 
2003/05/21 10:48:07 rt 1.106.2.5: RESYNC: (1.109-1.110); FILE MERGED
2003/05/09 08:31:39 lo 1.106.2.4: #107420# allow actions when socomp not installed
2003/05/08 13:59:50 lo 1.106.2.3: #107420# display OEM dialog only when window is opened
2003/05/07 06:51:07 os 1.106.2.2: RESYNC: (1.106-1.109); FILE MERGED
2003/04/29 11:16:22 lo 1.106.2.1: #107420# oem dialog moved to ../so_comp
This commit is contained in:
Vladimir Glazounov 2003-05-22 07:51:28 +00:00
parent 2447a971ae
commit e9a1e6147f
1 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
desktop/source/app/app.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: app.cxx,v $
*
* $Revision: 1.110 $
* $Revision: 1.111 $
*
* last change: $Author: vg $ $Date: 2003-05-16 14:20:54 $
* last change: $Author: vg $ $Date: 2003-05-22 08:51:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -72,7 +72,6 @@
#include "configinit.hxx"
#include "javainteractionhandler.hxx"
#include "lockfile.hxx"
#include "oempreload.hxx"
#include "testtool.hxx"
#include "checkinstall.hxx"
#include "cmdlinehelp.hxx"
@ -164,6 +163,12 @@
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_
#include <com/sun/star/beans/NamedValue.hpp>
#endif
#ifndef _COM_SUN_STAR_TASK_XJOB_HPP_
#include <com/sun/star/task/XJob.hpp>
#endif
#include <com/sun/star/java/XJavaVM.hpp>
@ -285,6 +290,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::system;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::container;
@ -1400,7 +1406,6 @@ void Desktop::Main()
sal_Bool bTerminateRequested = sal_False;
// Preload function depends on an initialized sfx application!
bTerminateRequested = OEMPreloadProcess();
SetSplashScreenProgress(75);
sal_Bool bUseSystemFileDialog;
@ -1615,6 +1620,17 @@ IMPL_LINK( Desktop, AsyncInitFirstRun, void*, NOTINTERESTEDIN )
}
// ========================================================================
IMPL_STATIC_LINK( Desktop, AsyncTerminate, void*, NOTINTERESTEDIN )
{
Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
Reference< XDesktop > xDesktop( rFactory->createInstance(
OUString::createFromAscii("com.sun.star.frame.Desktop")),
UNO_QUERY );
xDesktop.is() && xDesktop->terminate();
return 0L;
}
IMPL_LINK( Desktop, OpenClients_Impl, void*, pvoid )
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::OpenClients_Impl" );
@ -1648,6 +1664,23 @@ void Desktop::EnableOleAutomation()
#endif
}
sal_Bool Desktop::CheckOEM()
{
Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
Reference<XJob> rOemJob(rFactory->createInstance(
OUString::createFromAscii("com.sun.star.office.OEMPreloadJob")),
UNO_QUERY );
Sequence<NamedValue> args;
sal_Bool bResult = sal_False;
if (rOemJob.is()) {
Any aResult = rOemJob->execute(args);
aResult >>= bResult;
return bResult;
} else {
return sal_True;
}
}
void Desktop::OpenClients()
{
// check if a document has been recovered - if there is one of if a document was loaded by cmdline, no default document
@ -1658,6 +1691,14 @@ void Desktop::OpenClients()
CommandLineArgs* pArgs = GetCommandLineArgs();
SvtInternalOptions aInternalOptions;
Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
// if we need to display the OEM dialog, we need to do it here
if (!pArgs->IsQuickstart() && !Desktop::CheckOEM())
{
Application::PostUserEvent( STATIC_LINK( 0, Desktop, AsyncTerminate ) );
}
if ( !pArgs->IsServer() && !pArgs->IsNoRestore() && !aInternalOptions.IsRecoveryListEmpty() )
{
// crash recovery