diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:39:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:39:44 +0000 |
| commit | 964197dde8924d9e6bfacf727398422685730703 (patch) | |
| tree | f54615dc0ec88ddabeeff0731c797d19028f3e01 /basctl/source/basicide/basobj3.cxx | |
| parent | 6a0bf51c7cc6527e883414b5360a63be634f25be (diff) | |
INTEGRATION: CWS mav09 (1.25.32); FILE MERGED
2004/09/16 21:41:52 mav 1.25.32.5: RESYNC: (1.28-1.29); FILE MERGED
2004/08/09 17:28:11 mav 1.25.32.4: RESYNC: (1.27-1.28); FILE MERGED
2004/07/07 19:26:22 mav 1.25.32.3: RESYNC: (1.26-1.27); FILE MERGED
2004/04/29 17:47:27 mav 1.25.32.2: RESYNC: (1.25-1.26); FILE MERGED
2004/04/14 13:56:07 mba 1.25.32.1: #i27773#: remove so3; new storage API
Diffstat (limited to 'basctl/source/basicide/basobj3.cxx')
| -rw-r--r-- | basctl/source/basicide/basobj3.cxx | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index b6d8e5902..775162f44 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basobj3.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2004-08-31 12:20:43 $ + * last change: $Author: kz $ $Date: 2004-10-04 19:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,10 +59,6 @@ * ************************************************************************/ -#ifndef _SFX_IPFRM_HXX -#include <sfx2/ipfrm.hxx> -#endif - #include <ide_pch.hxx> #pragma hdrstop @@ -914,18 +910,9 @@ long BasicIDE::HandleBasicError( StarBASIC* pBasic ) pIDEShell = IDE_DLL()->GetShell(); if ( !pIDEShell ) { - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - SfxDispatcher* pDispatcher = ( pViewFrame && !pViewFrame->ISA( SfxInPlaceFrame ) ) ? pViewFrame->GetDispatcher() : NULL; - if ( pDispatcher ) - { - pDispatcher->Execute( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON ); - } - else - { - SfxAllItemSet aArgs( SFX_APP()->GetPool() ); - SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs ); - SFX_APP()->ExecuteSlot( aRequest ); - } + SfxAllItemSet aArgs( SFX_APP()->GetPool() ); + SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs ); + SFX_APP()->ExecuteSlot( aRequest ); pIDEShell = IDE_DLL()->GetShell(); } } |