diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:22:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:22:55 +0000 |
| commit | 34fd7965cd38828033fc5106e9e3102ee2fe074d (patch) | |
| tree | 4824a11b0cfc4ae86e5269973b1520e7ec59fae0 /basctl/source/basicide/bastype3.cxx | |
| parent | 5696ec0b082f4525bfb40251389950b84fe0045f (diff) | |
INTEGRATION: CWS basmgr03 (1.22.12); FILE MERGED
2007/09/24 11:06:31 fs 1.22.12.3: #i81767# getAllScriptDocuments parameter changed
2007/07/30 13:40:00 fs 1.22.12.2: #i73331# be a DocumentEventListener, which is independent from SFX notifications, but works with the GlobalEventBroadcaster instead
2007/07/26 08:56:47 fs 1.22.12.1: #i73331# first steps: replace some SfxObjectShell API calls with existing UNO API equivalents
Diffstat (limited to 'basctl/source/basicide/bastype3.cxx')
| -rw-r--r-- | basctl/source/basicide/bastype3.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 709b97912f09..8bc1e3885f25 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bastype3.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2007-03-15 15:55:35 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:22:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,8 +69,8 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) { BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) ); ScriptDocument aDocument( aDesc.GetDocument() ); - OSL_ENSURE( aDocument.isValid(), "BasicTreeListBox::RequestingChilds: invalid document!" ); - if ( !aDocument.isValid() ) + OSL_ENSURE( aDocument.isAlive(), "BasicTreeListBox::RequestingChilds: invalid document!" ); + if ( !aDocument.isAlive() ) return; LibraryLocation eLocation( aDesc.GetLocation() ); @@ -170,13 +170,13 @@ void BasicTreeListBox::ScanAllEntries() ScanEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER ); ScanEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_SHARE ); - ScriptDocuments aDocuments( ScriptDocument::getAllScriptDocuments( false ) ); + ScriptDocuments aDocuments( ScriptDocument::getAllScriptDocuments( ScriptDocument::DocumentsSorted ) ); for ( ScriptDocuments::const_iterator doc = aDocuments.begin(); doc != aDocuments.end(); ++doc ) { - if ( !doc->isClosing() ) + if ( doc->isAlive() ) ScanEntry( *doc, LIBRARY_LOCATION_DOCUMENT ); } } @@ -438,10 +438,9 @@ bool BasicTreeListBox::IsValidEntry( SvLBoxEntry* pEntry ) { case OBJ_TYPE_DOCUMENT: { - bIsValid = ( aDocument.isApplication() - || ( GetRootEntryName( aDocument, eLocation ) == GetEntryText( pEntry ) - && !aDocument.isClosing() - ) + bIsValid = aDocument.isAlive() + && ( aDocument.isApplication() + || GetRootEntryName( aDocument, eLocation ) == GetEntryText( pEntry ) ); } break; |