Kaydet (Commit) c8e471a1 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS uno3 (1.11.58); FILE MERGED

2003/04/16 14:55:15 tbe 1.11.58.1: #108974# Office crashes when creating new Basic library in backing component
üst ece1ee95
......@@ -2,9 +2,9 @@
*
* $RCSfile: objdlg.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: sb $ $Date: 2002-07-04 13:33:07 $
* last change: $Author: vg $ $Date: 2003-04-24 14:05:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -59,6 +59,9 @@
*
************************************************************************/
#ifndef _SFX_IPFRM_HXX
#include <sfx2/ipfrm.hxx>
#endif
#include <ide_pch.hxx>
......@@ -266,12 +269,17 @@ IMPL_LINK( ObjectCatalog, ToolBoxHdl, ToolBox*, pToolBox )
case TBITEM_SHOW:
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
DBG_ASSERT( pViewFrame != NULL, "No current view frame!" );
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
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 );
}
SvLBoxEntry* pCurEntry = aMacroTreeList.GetCurEntry();
DBG_ASSERT( pCurEntry, "Entry?!" );
SbxItem aSbxItem = aMacroTreeList.GetSbxItem( pCurEntry );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment