diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:09:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:09:38 +0000 |
| commit | 5f4f3ef749e46c52da204e08998eab9ae6dcbe20 (patch) | |
| tree | b570dc48cf84d60021eff43e62cf88c5c9a3c6c0 /sfx2/source/appl | |
| parent | 87ea6c94122b732b7fb8504551f68af666d8a7a6 (diff) | |
INTEGRATION: CWS mba24issues01 (1.33.98); FILE MERGED
2007/11/01 10:29:07 mba 1.33.98.1: #i82726#: remove LateInitTimer
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appmain.cxx | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index bc6ef2fdba75..f9fe7147e062 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appmain.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: ihi $ $Date: 2007-07-11 13:09:59 $ + * last change: $Author: obo $ $Date: 2008-01-04 15:09:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -219,61 +219,6 @@ void SfxApplication::Main( ) { } -//-------------------------------------------------------------------- -void SfxApplication::InsertLateInitHdl(const Link& rLink) -{ - if ( Application::IsInExecute() ) - Application::PostUserEvent( rLink ); - else - { - if ( !pAppData_Impl->pInitLinkList ) - pAppData_Impl->pInitLinkList = new SfxInitLinkList; - - Link *pLink = new Link; - *pLink = rLink; - USHORT nCount = ( USHORT ) pAppData_Impl->pInitLinkList->Count(); - pAppData_Impl->pInitLinkList->Insert(pLink, nCount); - } -} - -//------------------------------------------------------------------------- - -IMPL_LINK( SfxApplication, LateInitTimerHdl_Impl, void*, pvoid) -{ - (void)pvoid; // unused variable - if ( !SfxViewFrame::GetFirst( 0,0,FALSE ) ) - { - pAppData_Impl->aLateInitTimer.Start(); - return 0; - } - - if ( pAppData_Impl->pInitLinkList && pAppData_Impl->pInitLinkList->Count() ) - { - // Ersten Link aus der Liste holen und ausf"uhren - Link *pLink = (*pAppData_Impl->pInitLinkList)[0]; - pLink->Call(0); - - // Link entfernen - pAppData_Impl->pInitLinkList->Remove(0); - delete pLink; - - // Timer wieder starten, wenn noch weitere Links da sind - if ( pAppData_Impl->pInitLinkList->Count() ) - pAppData_Impl->aLateInitTimer.Start(); - else - { - // LateInit ist fertig - DELETEZ (pAppData_Impl->pInitLinkList); -#if SUPD<613//MUSTINI - pAppIniMgr->ResetLock(); -#endif - } - } - return 0; -} - -//------------------------------------------------------------------------- - //------------------------------------------------------------------------- SfxFilterMatcher& SfxApplication::GetFilterMatcher() |