Skip to content

C
core
Kaydet (Commit) 77fd24af authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Remove remaining DBG_CTOR etc. remnants from basic 

Change-Id: Ia714029c2e32e28c1bb6f4f59d0c7f357eccc236
üst 1714f4d3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 104 deletions
basic/source/basmgr/basmgr.cxx
Dosyayı görüntüle @ 77fd24af
......@@ -99,7 +99,6 @@ static const char szCryptingKey[] = "CryptedBasic";
static const char szScriptLanguage[] = "StarBasic";
TYPEINIT1( BasicManager, SfxBroadcaster );
DBG_NAME( BasicManager );
StreamMode eStreamReadMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL;
StreamMode eStorageReadMode = STREAM_READ | STREAM_SHARE_DENYWRITE;
......@@ -583,8 +582,6 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib, OUString* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
Init();
if( pLibPath )
......@@ -777,7 +774,6 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
BasicManager::BasicManager( StarBASIC* pSLib, OUString* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
Init();
DBG_ASSERT( pSLib, "BasicManager cannot be created with a NULL-Pointer!" );
......@@ -826,9 +822,6 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, bool bLoadLibs )
{
DBG_CHKTHIS( BasicManager, 0 );
SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
OUString aStorName( rStorage.GetName() );
......@@ -913,9 +906,6 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
{
DBG_CHKTHIS( BasicManager, 0 );
SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szOldManagerStream), eStreamReadMode );
OUString aStorName( rStorage.GetName() );
......@@ -996,8 +986,6 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
BasicManager::~BasicManager()
{
DBG_DTOR( BasicManager, 0 );
// Notify listener if something needs to be saved
Broadcast( SfxSimpleHint( SFX_HINT_DYING) );
......@@ -1034,16 +1022,12 @@ bool BasicManager::HasExeCode( const OUString& sLib )
void BasicManager::Init()
{
DBG_CHKTHIS( BasicManager, 0 );
pLibs = new BasicLibs;
mpImpl = new BasicManagerImpl();
}
BasicLibInfo* BasicManager::CreateLibInfo()
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = new BasicLibInfo;
pLibs->Insert( pInf );
return pInf;
......@@ -1051,8 +1035,6 @@ BasicLibInfo* BasicManager::CreateLibInfo()
bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, bool bInfosOnly )
{
DBG_CHKTHIS( BasicManager, 0 );
DBG_ASSERT( pLibInfo, "LibInfo!?" );
OUString aStorageName( pLibInfo->GetStorageName() );
......@@ -1239,8 +1221,6 @@ void BasicManager::CheckModules( StarBASIC* pLib, bool bReference ) const
StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const OUString& rLibName, bool bReference )
{
DBG_CHKTHIS( BasicManager, 0 );
OUString aStorName( rStorage.GetName() );
DBG_ASSERT( !aStorName.isEmpty(), "No Storage Name!" );
......@@ -1292,8 +1272,6 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const OUString& rLibName,
bool BasicManager::IsReference( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
DBG_ASSERT( pLibInfo, "Lib?!" );
if ( pLibInfo )
......@@ -1311,7 +1289,6 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib )
bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
{
DBG_CHKTHIS( BasicManager, 0 );
DBG_ASSERT( nLib, "Standard-Lib cannot be removed!" );
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
......@@ -1389,13 +1366,11 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
sal_uInt16 BasicManager::GetLibCount() const
{
DBG_CHKTHIS( BasicManager, 0 );
return (sal_uInt16)pLibs->Count();
}
StarBASIC* BasicManager::GetLib( sal_uInt16 nLib ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->GetObject( nLib );
DBG_ASSERT( pInf, "Lib does not exist!" );
if ( pInf )
......@@ -1407,15 +1382,12 @@ StarBASIC* BasicManager::GetLib( sal_uInt16 nLib ) const
StarBASIC* BasicManager::GetStdLib() const
{
DBG_CHKTHIS( BasicManager, 0 );
StarBASIC* pLib = GetLib( 0 );
return pLib;
}
StarBASIC* BasicManager::GetLib( const OUString& rName ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->First();
while ( pInf )
{
......@@ -1430,8 +1402,6 @@ StarBASIC* BasicManager::GetLib( const OUString& rName ) const
sal_uInt16 BasicManager::GetLibId( const OUString& rName ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->First();
while ( pInf )
{
......@@ -1446,8 +1416,6 @@ sal_uInt16 BasicManager::GetLibId( const OUString& rName ) const
bool BasicManager::HasLib( const OUString& rName ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->First();
while ( pInf )
{
......@@ -1462,8 +1430,6 @@ bool BasicManager::HasLib( const OUString& rName ) const
bool BasicManager::SetLibName( sal_uInt16 nLib, const OUString& rName )
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
DBG_ASSERT( pLibInfo, "Lib?!" );
if ( pLibInfo )
......@@ -1482,8 +1448,6 @@ bool BasicManager::SetLibName( sal_uInt16 nLib, const OUString& rName )
OUString BasicManager::GetLibName( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
DBG_ASSERT( pLibInfo, "Lib?!" );
if ( pLibInfo )
......@@ -1495,8 +1459,6 @@ OUString BasicManager::GetLibName( sal_uInt16 nLib )
bool BasicManager::LoadLib( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
bool bDone = false;
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
DBG_ASSERT( pLibInfo, "Lib?!" );
......@@ -1530,7 +1492,6 @@ bool BasicManager::LoadLib( sal_uInt16 nLib )
StarBASIC* BasicManager::CreateLib( const OUString& rLibName )
{
DBG_CHKTHIS( BasicManager, 0 );
if ( GetLib( rLibName ) )
{
return 0;
......@@ -1580,7 +1541,6 @@ StarBASIC* BasicManager::CreateLib( const OUString& rLibName, const OUString& Pa
StarBASIC* BasicManager::CreateLibForLibContainer( const OUString& rLibName,
const uno::Reference< script::XLibraryContainer >& xScriptCont )
{
DBG_CHKTHIS( BasicManager, 0 );
if ( GetLib( rLibName ) )
{
return 0;
......@@ -1599,8 +1559,6 @@ StarBASIC* BasicManager::CreateLibForLibContainer( const OUString& rLibName,
BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = ((BasicManager*)this)->pLibs->First();
while ( pInf )
{
......@@ -1616,8 +1574,6 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
bool BasicManager::IsBasicModified() const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->First();
while ( pInf )
{
......
basic/source/sbx/sbxarray.cxx
Dosyayı görüntüle @ 77fd24af
......@@ -186,10 +186,6 @@ SbxVariable* SbxArray::Get32( sal_uInt32 nIdx )
if ( !rRef.Is() )
rRef = new SbxVariable( eType );
#ifdef DBG_UTIL
else
DBG_CHKOBJ( rRef, SbxBase, 0 );
#endif
return rRef;
}
......@@ -205,10 +201,6 @@ SbxVariable* SbxArray::Get( sal_uInt16 nIdx )
if ( !rRef.Is() )
rRef = new SbxVariable( eType );
#ifdef DBG_UTIL
else
DBG_CHKOBJ( rRef, SbxBase, 0 );
#endif
return rRef;
}
......@@ -268,12 +260,6 @@ static const OUString sEmpty("");
{
return sEmpty;
}
#ifdef DBG_UTIL
else
{
DBG_CHKOBJ( rRef, SbxBase, 0 );
}
#endif
return *rRef.pAlias;
}
......
basic/source/sbx/sbxbase.cxx
Dosyayı görüntüle @ 77fd24af
......@@ -47,62 +47,48 @@ SbxAppData::~SbxAppData()
delete pBasicFormater;
}
//////////////////////////////// SbxBase
DBG_NAME(SbxBase);
SbxBase::SbxBase()
{
DBG_CTOR( SbxBase, 0 );
nFlags = SBX_READWRITE;
}
SbxBase::SbxBase( const SbxBase& r )
: SvRefBase( r )
{
DBG_CTOR( SbxBase, 0 );
nFlags = r.nFlags;
}
SbxBase::~SbxBase()
{
DBG_DTOR(SbxBase,0);
}
SbxBase& SbxBase::operator=( const SbxBase& r )
{
DBG_CHKTHIS( SbxBase, 0 );
nFlags = r.nFlags;
return *this;
}
SbxDataType SbxBase::GetType() const
{
DBG_CHKTHIS( SbxBase, 0 );
return SbxEMPTY;
}
SbxClassType SbxBase::GetClass() const
{
DBG_CHKTHIS( SbxBase, 0 );
return SbxCLASS_DONTCARE;
}
void SbxBase::Clear()
{
DBG_CHKTHIS( SbxBase, 0 );
}
bool SbxBase::IsFixed() const
{
DBG_CHKTHIS( SbxBase, 0 );
return IsSet( SBX_FIXED );
}
void SbxBase::SetModified( bool b )
{
DBG_CHKTHIS( SbxBase, 0 );
if( IsSet( SBX_NO_MODIFY ) )
return;
if( b )
......@@ -270,7 +256,6 @@ void SbxBase::Skip( SvStream& rStrm )
bool SbxBase::Store( SvStream& rStrm )
{
DBG_CHKTHIS( SbxBase, 0 );
if( !( nFlags & SBX_DONTSTORE ) )
{
rStrm.WriteUInt32( (sal_uInt32) GetCreator() )
......@@ -296,37 +281,31 @@ bool SbxBase::Store( SvStream& rStrm )
bool SbxBase::LoadData( SvStream&, sal_uInt16 )
{
DBG_CHKTHIS( SbxBase, 0 );
return false;
}
bool SbxBase::StoreData( SvStream& ) const
{
DBG_CHKTHIS( SbxBase, 0 );
return false;
}
bool SbxBase::LoadPrivateData( SvStream&, sal_uInt16 )
{
DBG_CHKTHIS( SbxBase, 0 );
return true;
}
bool SbxBase::StorePrivateData( SvStream& ) const
{
DBG_CHKTHIS( SbxBase, 0 );
return true;
}
bool SbxBase::LoadCompleted()
{
DBG_CHKTHIS( SbxBase, 0 );
return true;
}
bool SbxBase::StoreCompleted()
{
DBG_CHKTHIS( SbxBase, 0 );
return true;
}
......
basic/source/uno/namecont.cxx
Dosyayı görüntüle @ 77fd24af
......@@ -364,11 +364,6 @@ bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScri
return true; // notify all other listeners too
}
// Implementation class SfxLibraryContainer
DBG_NAME( SfxLibraryContainer )
// Ctor
SfxLibraryContainer::SfxLibraryContainer( void )
: SfxLibraryContainer_BASE( maMutex )
......@@ -384,8 +379,6 @@ SfxLibraryContainer::SfxLibraryContainer( void )
, mbOwnBasMgr( false )
, meInitMode(DEFAULT)
{
DBG_CTOR( SfxLibraryContainer, NULL );
mxContext = comphelper::getProcessComponentContext();
mxSFI = ucb::SimpleFileAccess::create( mxContext );
......@@ -399,7 +392,6 @@ SfxLibraryContainer::~SfxLibraryContainer()
{
BasicManager::LegacyDeleteBasicManager( mpBasMgr );
}
DBG_DTOR( SfxLibraryContainer, NULL );
}
void SfxLibraryContainer::checkDisposed() const
......
include/basic/sbxcore.hxx
Dosyayı görüntüle @ 77fd24af
......@@ -52,8 +52,6 @@ class SbxBase;
class SbxFactory;
class SbxObject;
DBG_NAMEEX_VISIBILITY(SbxBase, BASIC_DLLPUBLIC)
class BASIC_DLLPUBLIC SbxBase : virtual public SvRefBase
{
virtual bool LoadData( SvStream&, sal_uInt16 );
......@@ -111,43 +109,40 @@ public:
SV_DECL_REF(SbxBase)
inline void SbxBase::SetFlags( sal_uInt16 n )
{ //DBG_CHKTHIS( SbxBase, 0 );
nFlags = n; }
{ nFlags = n; }
inline sal_uInt16 SbxBase::GetFlags() const
{ DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
{ return nFlags; }
inline void SbxBase::SetFlag( sal_uInt16 n )
{ //DBG_CHKTHIS( SbxBase, 0 );
nFlags |= n; }
{ nFlags |= n; }
inline void SbxBase::ResetFlag( sal_uInt16 n )
{ //DBG_CHKTHIS( SbxBase, 0 );
nFlags &= ~n; }
{ nFlags &= ~n; }
inline bool SbxBase::IsSet( sal_uInt16 n ) const
{ DBG_CHKTHIS( SbxBase, 0 ); return ( nFlags & n ) != 0; }
{ return ( nFlags & n ) != 0; }
inline bool SbxBase::IsReset( sal_uInt16 n ) const
{ DBG_CHKTHIS( SbxBase, 0 ); return ( nFlags & n ) == 0; }
{ return ( nFlags & n ) == 0; }
inline bool SbxBase::CanRead() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
{ return IsSet( SBX_READ ); }
inline bool SbxBase::CanWrite() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
{ return IsSet( SBX_WRITE ); }
inline bool SbxBase::IsModified() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
{ return IsSet( SBX_MODIFIED ); }
inline bool SbxBase::IsConst() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
{ return IsSet( SBX_CONST ); }
inline bool SbxBase::IsHidden() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
{ return IsSet( SBX_HIDDEN ); }
inline bool SbxBase::IsVisible() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
{ return IsReset( SBX_INVISIBLE ); }
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment