diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:24:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:24:29 +0000 |
| commit | 05b0415946eabcffa7c5e1b927b329bbb8c0c1ae (patch) | |
| tree | c2854c4482c12779036660fe693260ef85521b2a /basctl/source/basicide/moduldlg.cxx | |
| parent | 520563557a6cbe590c1f8889de572b5e6a1c2af9 (diff) | |
INTEGRATION: CWS basmgr03 (1.31.12); FILE MERGED
2007/08/24 19:50:03 fs 1.31.12.3: RESYNC: (1.31-1.32); FILE MERGED
2007/07/30 13:41:09 fs 1.31.12.2: #i73331# distinguish between a ScriptDocument being valid and being alive
2007/07/26 09:10:50 fs 1.31.12.1: remove unused calls to SfxViewFrame::Current
Diffstat (limited to 'basctl/source/basicide/moduldlg.cxx')
| -rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index d3dd36a5af9a..d6bb6a04037e 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: moduldlg.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2007-08-03 09:59:04 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:24:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -692,13 +692,12 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) { if ( pButton == &aEditButton ) { - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); SfxAllItemSet aArgs( SFX_APP()->GetPool() ); SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs ); SFX_APP()->ExecuteSlot( aRequest ); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); - pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; + SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); DBG_ASSERT( pCurEntry, "Entry?!" ); @@ -756,8 +755,8 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, String& rLibName ) if ( !rLibName.Len() ) rLibName = String::CreateFromAscii( "Standard" ); - DBG_ASSERT( rDocument.isValid(), "ObjectPage::GetSelection: no ScriptDocument in the selection!" ); - if ( !rDocument.isValid() ) + DBG_ASSERT( rDocument.isAlive(), "ObjectPage::GetSelection: no or dead ScriptDocument in the selection!" ); + if ( !rDocument.isAlive() ) return false; // check if the module library is loaded @@ -884,8 +883,8 @@ void ObjectPage::DeleteCurrent() DBG_ASSERT( pCurEntry, "Kein aktueller Eintrag!" ); BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) ); ScriptDocument aDocument( aDesc.GetDocument() ); - DBG_ASSERT( aDocument.isValid(), "ObjectPage::DeleteCurrent: no document!" ); - if ( !aDocument.isValid() ) + DBG_ASSERT( aDocument.isAlive(), "ObjectPage::DeleteCurrent: no document!" ); + if ( !aDocument.isAlive() ) return; String aLibName( aDesc.GetLibName() ); String aName( aDesc.GetName() ); @@ -965,8 +964,8 @@ void LibDialog::SetStorageName( const String& rName ) SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, BasicTreeListBox& rBasicBox, const String& rLibName, String aModName, bool bMain ) { - OSL_ENSURE( rDocument.isValid(), "createModImpl: invalid document!" ); - if ( !rDocument.isValid() ) + OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" ); + if ( !rDocument.isAlive() ) return NULL; SbModule* pModule = NULL; |