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

INTEGRATION: CWS mba23issues03 (1.203.6); FILE MERGED

Browse source 
2007/06/14 09:47:35 mba 1.203.6.2: #i78304: allow to terminate office immediately for performance measurements
2007/06/14 09:42:59 mba 1.203.6.1: #i54275#: disable recovery via environment variable
This commit is contained in:
Ivo Hinkelmann 2007-07-11 12:15:28 +00:00
parent 15579603c7
commit 5fc78de841
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,9 @@
*
* $RCSfile: app.cxx,v $
*
* $Revision: 1.206 $
* $Revision: 1.207 $
*
* last change: $Author: ihi $ $Date: 2007-07-10 15:24:16 $
* last change: $Author: ihi $ $Date: 2007-07-11 13:15:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1913,6 +1913,20 @@ IMPL_STATIC_LINK_NOINSTANCE( Desktop, AsyncTerminate, void*, EMPTYARG )
return 0L;
}
class ExitTimer : public Timer
{
public:
ExitTimer()
{
SetTimeout(500);
Start();
}
virtual void Timeout()
{
exit(42);
}
};
IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
{
RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE - DesktopOpenClients_Impl()" );
@ -1930,6 +1944,9 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
// OfficeIPCThread::SetReady();
EnableOleAutomation();
if (getenv ("OOO_EXIT_POST_STARTUP"))
new ExitTimer();
return 0;
}
@ -2463,7 +2480,7 @@ void Desktop::OpenClients()
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
if (
if ( !getenv ("OOO_DISABLE_RECOVERY") &&
( ! bLoaded ) &&
(
( bExistsRecoveryData ) || // => crash with files => recovery