INTEGRATION: CWS mba30patches01 (1.7.12); FILE MERGED

2008/04/23 09:45:34 mba 1.7.12.2: RESYNC: (1.7-1.8); FILE MERGED
2008/03/18 15:40:06 mba 1.7.12.1: #i86353#: remove unused code

1 files changed, 1 insertions, 274 deletions

diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index bc549897da..4883f6ca78 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: database.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -85,20 +85,6 @@ SvIdlDataBase::~SvIdlDataBase()
 }
 
 /*************************************************************************
-|*    SvIdlDataBase::IsModified()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlDataBase::IsModified() const
-{
-    for( ULONG n = 0; n < aModuleList.Count(); n++ )
-        if( aModuleList.GetObject( n )->IsModified() )
-            return TRUE;
-    //bIsModified;
-    return FALSE;
-}
-
-/*************************************************************************
 |*    SvIdlDataBase::GetTypeList()
 |*
 |*    Beschreibung
@@ -492,43 +478,6 @@ SvMetaType * SvIdlDataBase::FindType( const ByteString & rName )
 }
 
 /*************************************************************************
-|*    SvIdlDataBase::FindName()
-|*
-|*    Beschreibung
-*************************************************************************/
-ByteString * SvIdlDataBase::FindName( const ByteString & rName, ByteStringList & rList )
-{
-    ByteString * pS = rList.First();
-    while( pS && *pS != rName )
-        pS = rList.Next();
-    return pS;
-}
-
-/*************************************************************************
-|*    SvIdlDataBase::FillTypeList()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlDataBase::FillTypeList( SvMetaTypeList & rOutList,
-                                  SvToken * pNameTok )
-{
-    rOutList.Clear();
-//    if( pNameTok->IsIdentifierHash() ) Optimierung spaeter
-    if( pNameTok->IsIdentifier() )
-    {
-        ByteString aName = pNameTok->GetString();
-        SvMetaType * pMetaType = GetTypeList().First();
-        while( pMetaType )
-        {
-            if( pMetaType->GetName() == aName )
-                rOutList.Insert( pMetaType, LIST_APPEND );
-            pMetaType = GetTypeList().Next();
-        }
-    }
-    return rOutList.Count() != 0;
-}
-
-/*************************************************************************
 |*    SvIdlDataBase::ReadKnownType()
 |*
 |*    Beschreibung
@@ -648,34 +597,6 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
 |*    Beschreibung
 |*
 *************************************************************************/
-SvMetaAttribute * SvIdlDataBase::FindAttr( SvMetaAttributeMemberList * pList,
-                                      SvMetaAttribute * pAttr ) const
-{
-    for( ULONG n = 0; n < pList->Count(); n++ )
-    {
-        SvMetaAttribute * p = pList->GetObject( n );
-        if( p->GetName() == pAttr->GetName() )
-            return pAttr;
-        else if( p->GetSlotId().GetValue() == pAttr->GetSlotId().GetValue() )
-        {
-            ByteString aStr = "different slot names with same id: ";
-            aStr += p->GetName();
-            aStr += " and ";
-            aStr += pAttr->GetName();
-            WriteError( "warning", "*.srs", aStr );
-            return FALSE;
-        }
-    }
-    return NULL;
-}
-
-/*************************************************************************
-|*
-|*    SvIdlDataBase::ReadKnownAttr()
-|*
-|*    Beschreibung
-|*
-*************************************************************************/
 SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
 (
     SvTokenStream & rInStm,
@@ -1060,65 +981,6 @@ BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
 }
 
 /*************************************************************************
-|*    SvIdlWorkingBase::WriteCHeader()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteCHeader( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    ULONG n;
-    for( n = 0; n < GetTypeList().Count(); n++ )
-    {
-        SvMetaType * pType = GetTypeList().GetObject( n );
-        pType->Write( *this, rOutStm, 0, WRITE_C_HEADER );
-    }
-    for( n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-        {
-            aModulePrefix = pModule->GetModulePrefix();
-            pModule->Write( *this, rOutStm, 0, WRITE_C_HEADER );
-        }
-    }
-    return TRUE;
-}
-
-/*************************************************************************
-|*    SvIdlWorkingBase::WriteCSource()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteCSource( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    ULONG n;
-    for( n = 0; n < GetTypeList().Count(); n++ )
-    {
-        SvMetaType * pType = GetTypeList().GetObject( n );
-        pType->Write( *this, rOutStm, 0, WRITE_C_SOURCE );
-    }
-    rOutStm << endl;
-    for( n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-        {
-            aModulePrefix = pModule->GetModulePrefix();
-            pModule->Write( *this, rOutStm, 0, WRITE_C_SOURCE );
-        }
-    }
-    return TRUE;
-}
-
-
-
-/*************************************************************************
 |*    SvIdlWorkingBase::WriteSfxItem()
 |*
 |*    Beschreibung
@@ -1128,141 +990,6 @@ BOOL SvIdlWorkingBase::WriteSfxItem( SvStream & )
     return FALSE;
 }
 
-/*************************************************************************
-|*    SvIdlWorkingBase::WriteSbx()
-|*
-|*    Beschreibung
-*************************************************************************/
-/*
-BOOL SvIdlWorkingBase::WriteSbx( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    SvNamePosList 	aList;
-    SvMemoryStream aTmpStm( 256000, 256000 );
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-            pModule->WriteSbx( *this, aTmpStm, aList );
-    }
-    // Version, steht auch in so2 auto.cxx
-    rOutStm << (UINT32)0x1258F170;
-    rOutStm << (UINT32)aList.Count();
-    ULONG i ;
-    for( i = 0; i < aList.Count(); i++ )
-    {
-        SvNamePos * p = aList.GetObject( i );
-        rOutStm << p->aUUId;
-        rOutStm << (UINT32)0;
-    }
-    // Ende der Tabelle
-    ULONG nEndPos = rOutStm.Tell();
-    rOutStm.Seek( 2 * sizeof( UINT32 ) );
-    SvGlobalName aTmpName;
-    for( i = 0; i < aList.Count(); i++ )
-    {
-        SvNamePos * p = aList.GetObject( i );
-        // Um an die richtige Position zu gelangen
-        rOutStm >> aTmpName;
-        // richtigen Offset schreiben
-        rOutStm << (UINT32)(nEndPos + p->nStmPos);
-    }
-    aTmpStm.Seek( 0L );
-    rOutStm << aTmpStm;
-
-    return TRUE;
-}
-*/
-
-/*************************************************************************
-|*    SvIdlWorkingBase::WriteOdl()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteOdl( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-            pModule->Write( *this, rOutStm, 0, WRITE_ODL );
-    }
-    return TRUE;
-}
-
-/*************************************************************************
-|*    OdlWorkingBase::WriteSrc()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteSrc( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    Table aIdTable;
-    ULONG n;
-    for( n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        //if( !pModule->IsImported() )
-            pModule->WriteSrc( *this, rOutStm, &aIdTable );
-    }
-    const SvMetaAttributeMemberList & rAttrList = GetAttrList();
-    for( n = 0; n < rAttrList.Count(); n++ )
-    {
-        SvMetaAttribute * pAttr = rAttrList.GetObject( n );
-        pAttr->WriteSrc( *this, rOutStm, &aIdTable );
-    }
-
-    return TRUE;
-}
-
-/*************************************************************************
-|*    OdlWorkingBase::WriteCxx()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteCxx( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-            pModule->WriteCxx( *this, rOutStm, 0 );
-    }
-
-    return TRUE;
-}
-
-/*************************************************************************
-|*    OdlWorkingBase::WriteHxx()
-|*
-|*    Beschreibung
-*************************************************************************/
-BOOL SvIdlWorkingBase::WriteHxx( SvStream & rOutStm )
-{
-    if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
-
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
-    {
-        SvMetaModule * pModule = GetModuleList().GetObject( n );
-        if( !pModule->IsImported() )
-            pModule->WriteHxx( *this, rOutStm, 0 );
-    }
-
-    return TRUE;
-}
-
 void SvIdlDataBase::StartNewFile( const String& rName )
 {
     bExport = ( aExportFile.EqualsIgnoreCaseAscii( rName ) );