diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-24 13:01:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-24 13:01:50 +0000 |
| commit | 921fab80e7a0a446bb2c434de3ca33df4896b44b (patch) | |
| tree | 12e3cef8435f99a4d936a65ef1fc3595318c97ac /basic/source | |
| parent | 191f3dc369c1d0ef28003bfd5fb49868178e6589 (diff) | |
INTEGRATION: CWS uno3 (1.21.14); FILE MERGED
2003/04/17 09:05:38 ab 1.21.14.1: #i13114# Removed obsolete assertions concerning storage name
Diffstat (limited to 'basic/source')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 3048f90486e5..a0d3a5024191 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basmgr.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2003-04-23 16:55:30 $ + * last change: $Author: vg $ $Date: 2003-04-24 14:01:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1010,7 +1010,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, BOOL bLoadLibs ) ( ManagerStreamName, eStreamReadMode ); String aStorName( rStorage.GetName() ); - DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); + // #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); if ( !xManagerStream.Is() || xManagerStream->GetError() || ( xManagerStream->Seek( STREAM_SEEK_TO_END ) == 0 ) ) { @@ -1019,7 +1019,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, BOOL bLoadLibs ) } aStorageName = INetURLObject(aStorName, INET_PROT_FILE).GetMainURL( INetURLObject::NO_DECODE ); - DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name"); + // #i13114 removed, DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name"); String aRealStorageName = aStorageName; // fuer relative Pfade, kann durch BaseURL umgebogen werden. @@ -1617,13 +1617,13 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag if ( pCurStorage ) { String aStorName( pCurStorage->GetName() ); - DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); + // #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); INetURLObject aCurStorageEntry(aStorName, INET_PROT_FILE); - DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); + // #i13114 removed, DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); INetURLObject aStorageEntry(aStorageName, INET_PROT_FILE); - DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); + // #i13114 removed, DBG_ASSERT(aCurStorageEntry.GetMainURL( INetURLObject::NO_DECODE ).Len() != 0, "Bad storage name"); if ( aCurStorageEntry == aStorageEntry ) xStorage = pCurStorage; |