diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-16 08:12:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-16 08:13:33 +0200 |
commit | aef6ab2098f065f1cee102538776dd99d9db3b0f (patch) | |
tree | a7521309cb9263e07e3f62c498b2cca4432d052a /idl/source/objects/basobj.cxx | |
parent | d2ed493a4c0285ff711fcbb86abe6f7025cfd072 (diff) |
Strip svidl down to what is still used
...the generated .ilb, .lst, and .sid outputs requested by SdiTarget were
apparently unused.
Change-Id: I1abb2abc7945070451fce4a98a11d955515e3f63
Diffstat (limited to 'idl/source/objects/basobj.cxx')
-rw-r--r-- | idl/source/objects/basobj.cxx | 229 |
1 files changed, 4 insertions, 225 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 9cb4f358b38c..38dcd296a34d 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -28,19 +28,11 @@ #include <globals.hxx> #include <database.hxx> -SV_IMPL_META_FACTORY1( SvMetaObject, SvRttiBase ) +TYPEINIT1( SvMetaObject, SvRttiBase ) SvMetaObject::SvMetaObject() { } -void SvMetaObject::Load( SvPersistStream & ) -{ -} - -void SvMetaObject::Save( SvPersistStream & ) -{ -} - void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab ) { while( nTab-- ) @@ -101,57 +93,16 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & ) return false; } -void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ ) -{ -} - void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */, WriteType, WriteAttribute ) { } -SV_IMPL_META_FACTORY1( SvMetaName, SvMetaObject ); +TYPEINIT1( SvMetaName, SvMetaObject ); SvMetaName::SvMetaName() { } -void SvMetaName::Load( SvPersistStream & rStm ) -{ - SvMetaObject::Load( rStm ); - sal_uInt8 nMask; - rStm.ReadUChar( nMask ); - - if( nMask >= 0x20 ) - { - rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - OSL_FAIL( "wrong format" ); - return; - } - if( nMask & 0x01 ) rStm >> aName; - if( nMask & 0x02 ) rStm >> aHelpContext; - if( nMask & 0x04 ) rStm >> aHelpText; - if( nMask & 0x08 ) rStm >> aConfigName; - if( nMask & 0x10 ) rStm >> aDescription; -} - -void SvMetaName::Save( SvPersistStream & rStm ) -{ - SvMetaObject::Save( rStm ); - sal_uInt8 nMask = 0; - if( aName.IsSet() ) nMask |= 0x01; - if( aHelpContext.IsSet() ) nMask |= 0x02; - if( aHelpText.IsSet() ) nMask |= 0x04; - if( aConfigName.IsSet() ) nMask |= 0x08; - if( aDescription.IsSet() ) nMask |= 0x10; - - rStm.WriteUChar( nMask ); - if( nMask & 0x01 ) WriteSvString( rStm, aName ); - if( nMask & 0x02 ) WriteSvNumberIdentifier( rStm, aHelpContext ); - if( nMask & 0x04 ) WriteSvString( rStm, aHelpText ); - if( nMask & 0x08 ) WriteSvString( rStm, aConfigName ); - if( nMask & 0x10 ) WriteSvString( rStm, aDescription ); -} - bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * ) { aName.setString(rName); @@ -213,10 +164,6 @@ bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & ) return true; } -void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 ) -{ -} - void SvMetaName::WriteDescription( SvStream & rOutStm ) { rOutStm.WriteCharPtr( "<DESCRIPTION>" ) << endl; @@ -234,35 +181,6 @@ void SvMetaName::WriteDescription( SvStream & rOutStm ) rOutStm.WriteCharPtr( "</DESCRIPTION>" ) << endl; } -void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, - sal_uInt16 nTab ) -{ - if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() ) - { - WriteTab( rOutStm, nTab ); - rOutStm.WriteCharPtr( "// class SvMetaName" ) << endl; - } - if( aHelpContext.IsSet() ) - { - WriteTab( rOutStm, nTab ); - aHelpContext.WriteSvIdl( SvHash_HelpContext(), rOutStm, nTab ); - rOutStm.WriteChar( ';' ) << endl; - } - if( aHelpText.IsSet() ) - { - WriteTab( rOutStm, nTab ); - aHelpText.WriteSvIdl( rBase, rOutStm, nTab ); - rOutStm.WriteChar( ';' ) << endl; - } - if( aConfigName.IsSet() ) - { - WriteTab( rOutStm, nTab ); - aConfigName.WriteSvIdl( SvHash_ConfigName(), rOutStm, nTab ); - rOutStm.WriteChar( ';' ) << endl; - } -} - bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -293,43 +211,6 @@ bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) return bOk; } -void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab ) -{ - sal_uLong nBeginPos = rOutStm.Tell(); - WriteTab( rOutStm, nTab ); - rOutStm.WriteChar( '[' ) << endl; - sal_uLong nOldPos = rOutStm.Tell(); - WriteAttributesSvIdl( rBase, rOutStm, nTab +1 ); - - // write no empty brackets - if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) ) - // nothing written - rOutStm.Seek( nBeginPos ); - else - { - WriteTab( rOutStm, nTab ); - rOutStm.WriteChar( ']' ); - nBeginPos = rOutStm.Tell(); - rOutStm << endl; - } - - WriteTab( rOutStm, nTab ); - rOutStm.WriteChar( '{' ) << endl; - nOldPos = rOutStm.Tell(); - WriteContextSvIdl( rBase, rOutStm, nTab +1 ); - - // write no empty brackets - if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) ) - // nothing written - rOutStm.Seek( nBeginPos ); - else - { - WriteTab( rOutStm, nTab ); - rOutStm.WriteChar( '}' ); - } -} - void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType nT, WriteAttribute nA ) @@ -391,47 +272,13 @@ void SvMetaName::WriteContext( SvIdlDataBase &, SvStream &, { } -SV_IMPL_META_FACTORY1( SvMetaReference, SvMetaName ); +TYPEINIT1( SvMetaReference, SvMetaName ); SvMetaReference::SvMetaReference() { } -void SvMetaReference::Load( SvPersistStream & rStm ) -{ - SvMetaName::Load( rStm ); - - sal_uInt8 nMask; - rStm.ReadUChar( nMask ); - if( nMask >= 0x2 ) - { - rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - OSL_FAIL( "wrong format" ); - return; - } - if( nMask & 0x01 ) - { - SvMetaReference * pRef; - rStm >> pRef; - aRef = pRef; - } -} - -void SvMetaReference::Save( SvPersistStream & rStm ) -{ - SvMetaName::Save( rStm ); - - // create mask - sal_uInt8 nMask = 0; - if( aRef.Is() ) - nMask |= 0x01; - - // write data - rStm.WriteUChar( nMask ); - if( nMask & 0x01 ) WriteSvPersistBase( rStm, aRef ); -} - -SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference ); +TYPEINIT1( SvMetaExtern, SvMetaReference ); SvMetaExtern::SvMetaExtern() : pModule( NULL ) @@ -440,44 +287,6 @@ SvMetaExtern::SvMetaExtern() { } -void SvMetaExtern::Load( SvPersistStream & rStm ) -{ - SvMetaReference::Load( rStm ); - - sal_uInt8 nMask; - rStm.ReadUChar( nMask ); - if( nMask >= 0x20 ) - { - rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - OSL_FAIL( "wrong format" ); - return; - } - if( nMask & 0x01 ) rStm >> pModule; - if( nMask & 0x02 ) rStm >> aUUId; - if( nMask & 0x04 ) rStm >> aVersion; - if( nMask & 0x08 ) bReadUUId = true; - if( nMask & 0x10 ) bReadVersion = true; -} - -void SvMetaExtern::Save( SvPersistStream & rStm ) -{ - SvMetaReference::Save( rStm ); - - // create mask - sal_uInt8 nMask = 0; - if( pModule ) nMask |= 0x01; - if( aUUId != SvGlobalName() ) nMask |= 0x02; - if( aVersion != SvVersion() ) nMask |= 0x04; - if( bReadUUId ) nMask |= 0x08; - if( bReadVersion ) nMask |= 0x10; - - // write data - rStm.WriteUChar( nMask ); - if( nMask & 0x01 ) WriteSvPersistBase( rStm, pModule ); - if( nMask & 0x02 ) WriteSvGlobalName( rStm, aUUId ); - if( nMask & 0x04 ) WriteSvVersion( rStm, aVersion ); -} - SvMetaModule * SvMetaExtern::GetModule() const { DBG_ASSERT( pModule != NULL, "module not set" ); @@ -506,30 +315,6 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase, bReadVersion = true; } -void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ) -{ - SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab ); - if( bReadUUId || bReadVersion ) - { - WriteTab( rOutStm, nTab ); - rOutStm.WriteCharPtr( "// class SvMetaExtern" ) << endl; - - if( bReadUUId ) - { - WriteTab( rOutStm, nTab ); - aUUId.WriteSvIdl( rOutStm ); - rOutStm.WriteChar( ';' ) << endl; - } - if( bReadVersion ) - { - WriteTab( rOutStm, nTab ); - aVersion.WriteSvIdl( rOutStm ); - rOutStm.WriteChar( ';' ) << endl; - } - } -} - bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { SetModule( rBase ); @@ -537,12 +322,6 @@ bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) return SvMetaReference::ReadSvIdl( rBase, rInStm ); } -void SvMetaExtern::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab ) -{ - SvMetaReference::WriteSvIdl( rBase, rOutStm, nTab ); -} - void SvMetaExtern::Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType nT, WriteAttribute nA ) |