INTEGRATION: CWS impress5ea1 (1.25.30); FILE MERGED

2004/03/12 12:37:18 cl 1.25.30.1: #i14041# check for valid BasicIDEShell
This commit is contained in:
Rüdiger Timm 2004-03-30 13:27:13 +00:00
parent e9b8c21602
commit 4ea49166ad

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: basobj3.cxx,v $ * $RCSfile: basobj3.cxx,v $
* *
* $Revision: 1.25 $ * $Revision: 1.26 $
* *
* last change: $Author: vg $ $Date: 2004-01-06 17:12:59 $ * last change: $Author: rt $ $Date: 2004-03-30 14:27:13 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -849,13 +849,16 @@ void BasicIDE::BasicStopped( BOOL* pbAppWindowDisabled,
// AppWait ? // AppWait ?
USHORT nWait = 0; USHORT nWait = 0;
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
while ( pIDEShell->GetViewFrame()->GetWindow().IsWait() ) if( pIDEShell )
{ {
pIDEShell->GetViewFrame()->GetWindow().LeaveWait(); while ( pIDEShell->GetViewFrame()->GetWindow().IsWait() )
nWait++; {
pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
nWait++;
}
if ( pnWaitCount )
*pnWaitCount = nWait;
} }
if ( pnWaitCount )
*pnWaitCount = nWait;
// Interactive = FALSE ? // Interactive = FALSE ?
if ( SFX_APP()->IsDispatcherLocked() ) if ( SFX_APP()->IsDispatcherLocked() )