diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:58:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:58:30 +0000 |
| commit | 925ca30a376e46f71617920ad0b03ec49984d7ca (patch) | |
| tree | 7a80b86aa200266653b867dc0b2751b6a2ce3f35 /basctl | |
| parent | 5000fc4bd423f73b4c3e08dc9975785d1ba36028 (diff) | |
INTEGRATION: CWS tbe19 (1.39.22); FILE MERGED
2005/01/25 16:07:50 tbe 1.39.22.2: #i40346# embedded documents (forms/reports) appear without title in macro dialog
2005/01/25 14:52:32 tbe 1.39.22.1: #i40347# saving macros in embedded documents (forms/reports) does the wrong thing
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 20f686b0a27a..f9e0017a636a 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basides1.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: hr $ $Date: 2004-12-13 12:39:55 $ + * last change: $Author: vg $ $Date: 2005-02-24 16:58:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -344,7 +344,11 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) // document basic SfxObjectShell* pShell = pCurWin->GetShell(); if ( pShell ) - pShell->ExecuteSlot( rReq ); + { + SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( pShell ); + if ( pViewFrame ) + pViewFrame->GetBindings().Execute( nSlot ); + } SfxBindings &rBindings = BasicIDE::GetBindings(); rBindings.Invalidate( SID_DOC_MODIFIED ); @@ -694,7 +698,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) { SfxMedium* pMedium = pObjShell->GetMedium(); if ( ( pMedium && aDocument == String(pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE )) ) || - aDocument == pObjShell->GetTitle( SFX_TITLE_FILENAME ) ) + aDocument == pObjShell->GetTitle( SFX_TITLE_CAPTION ) ) { pShell = pObjShell; break; |