summaryrefslogtreecommitdiff
path: root/basctl/source/basicide/basides1.cxx
diff options
context:
space:
mode:
authorThomas Benisch <tbe@openoffice.org>2001-09-06 08:21:02 +0000
committerThomas Benisch <tbe@openoffice.org>2001-09-06 08:21:02 +0000
commit63bda9d370ac203aafd9596165e3e2d18e928d4b (patch)
tree88ecc6164ca8726d86210445425049489b69f204 /basctl/source/basicide/basides1.cxx
parente22be18d2dd23f8e026c779b5f8613b3b3b08455 (diff)
#86893# Getting a wrong macro
Diffstat (limited to 'basctl/source/basicide/basides1.cxx')
-rw-r--r--basctl/source/basicide/basides1.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1e318dd0d4e9..0b6870d5fd29 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: basides1.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: tbe $ $Date: 2001-09-03 11:46:17 $
+ * last change: $Author: tbe $ $Date: 2001-09-06 09:17:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -469,9 +469,8 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
if ( i ) // sonst 'Alle', also leer
aLib = *pStrings->GetObject( i );
SfxStringItem aLibName( SID_BASICIDE_ARG_LIBNAME, aLib );
- SfxViewFrame* pCurFrame = SfxViewFrame::Current();
- DBG_ASSERT( pCurFrame != NULL, "No current view frame!" );
- SfxDispatcher* pDispatcher = pCurFrame ? pCurFrame->GetDispatcher() : NULL;
+ SfxViewFrame* pViewFrame = GetViewFrame();
+ SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
{
pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
@@ -1284,9 +1283,8 @@ void __EXPORT BasicIDEShell::Deactivate( BOOL bMDI )
IMPL_LINK( BasicIDEShell, AccelSelectHdl, Accelerator*, pAccel )
{
BOOL bDone = TRUE;
- SfxViewFrame* pCurFrame = SfxViewFrame::Current();
- DBG_ASSERT( pCurFrame != NULL, "No current view frame!" );
- SfxDispatcher* pDispatcher = pCurFrame ? pCurFrame->GetDispatcher() : NULL;
+ SfxViewFrame* pViewFrame = GetViewFrame();
+ SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( !pDispatcher )
return FALSE;
switch ( pAccel->GetCurKeyCode().GetCode() )