From 5a0fd87d15ad0da5035337a8a1b90c4e32f855dd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 27 Jan 2012 10:00:03 +0000 Subject: remove WriteSrc, WriteCxx and WriteHxx I can't see that WriteSrc, WriteCxx WriteHxx are anything other than unused archaic remnants of the past. --- idl/inc/basobj.hxx | 3 -- idl/inc/module.hxx | 5 --- idl/inc/object.hxx | 4 -- idl/inc/slot.hxx | 2 - idl/inc/types.hxx | 2 - idl/source/objects/basobj.cxx | 8 ---- idl/source/objects/module.cxx | 31 --------------- idl/source/objects/object.cxx | 87 ------------------------------------------- idl/source/objects/slot.cxx | 77 -------------------------------------- idl/source/objects/types.cxx | 4 -- 10 files changed, 223 deletions(-) (limited to 'idl') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 6d49b4c9cfdd..9cd03b72702a 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -89,9 +89,6 @@ public: virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); - - virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); }; SV_DECL_IMPL_REF(SvMetaObject) SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *) diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 750914d206c9..4e5953eff717 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -97,11 +97,6 @@ public: virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, Table* pTable ); - virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table *pIdTable ); - - virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); }; SV_DECL_IMPL_REF(SvMetaModule) SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *) diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index a5d8432f0379..1dd2cef9fefb 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -141,10 +141,6 @@ public: virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, Table* pTable ); - virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pTable ); - virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); }; SV_IMPL_REF(SvMetaClass) SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 50d5d08c638e..3c00ca80e59b 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -261,8 +261,6 @@ public: SvStream & rOutStm ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, Table * pIdTable ); - virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pIdTable ); virtual void WriteCSV( SvIdlDataBase&, SvStream& ); }; SV_DECL_IMPL_REF(SvMetaSlot) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 8db0b7ed48cd..09ff414b4ec1 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -119,8 +119,6 @@ public: SvIdlDataBase& ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, Table * pIdTable ); - virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pIdTable ); virtual void WriteCSV( SvIdlDataBase&, SvStream& ); void FillIDTable(Table *pIDTable); rtl::OString Compare( SvMetaAttribute *pAttr ); diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 9a55bfc68326..8ad1b08a5281 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -119,14 +119,6 @@ void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */, { } -void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ ) -{ -} - -void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ ) -{ -} - SV_IMPL_META_FACTORY1( SvMetaName, SvMetaObject ); SvMetaName::SvMetaName() { diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index ab40dcd4e97c..c261d4c76dd3 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -507,35 +507,4 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, } } -void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pTable ) -{ - if( !aSlotIdFile.getString().isEmpty() ) - rOutStm << "//#include <" << aSlotIdFile.getString().getStr() << '>' << endl; - for( sal_uLong n = 0; n < aClassList.Count(); n++ ) - { - aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable ); - } -} - -void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab ) -{ - for( sal_uLong n = 0; n < aClassList.Count(); n++ ) - { - SvMetaClass * pClass = aClassList.GetObject( n ); - pClass->WriteHxx( rBase, rOutStm, nTab ); - } -} - -void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab ) -{ - for( sal_uLong n = 0; n < aClassList.Count(); n++ ) - { - SvMetaClass * pClass = aClassList.GetObject( n ); - pClass->WriteCxx( rBase, rOutStm, nTab ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 033e5a2c68e6..b95b0a031b54 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -661,91 +661,4 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, } } -void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pTable ) -{ - for( sal_uLong n=0; nWriteSrc( rBase, rOutStm, pTable ); - } -} - -void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 ) -{ - rtl::OString aSuperName(RTL_CONSTASCII_STRINGPARAM("SvDispatch")); - if( GetSuperClass() ) - aSuperName = GetSuperClass()->GetName().getString(); - const char * pSup = aSuperName.getStr(); - - rOutStm - << "class " << GetSvName().getStr() - << ": public " << pSup << endl - << '{' << endl - << "protected:" << endl - << "\tvirtual SvGlobalName GetTypeName() const;" << endl - << "\tvirtual sal_Bool FillTypeLibInfo( SvGlobalName *, sal_uInt16 * pMajor," << endl - << "\t sal_uInt16 * pMinor ) const;" << endl - << "\tvirtual sal_Bool FillTypeLibInfo( ByteString * pName, sal_uInt16 * pMajor," << endl; - rOutStm - << "\t sal_uInt16 * pMinor ) const;" << endl - << "\tvirtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl - << "public:" << endl - << "\t static SvGlobalName ClassName()" << endl - << "\t { return SvGlobalName( " << rtl::OUStringToOString(GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " ); }" << endl - << "};" << endl; -} - -void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 ) -{ - rtl::OString aSuperName(RTL_CONSTASCII_STRINGPARAM("SvDispatch")); - if( GetSuperClass() ) - aSuperName = GetSuperClass()->GetName().getString(); - const char * pSup = aSuperName.getStr(); - - rtl::OString name = GetSvName(); - // GetTypeName - rOutStm << "SvGlobalName " << name.getStr() << "::GetTypeName() const" << endl - << '{' << endl - << "\treturn ClassName();" << endl - << '}' << endl; - - SvMetaModule * pMod = GetModule(); - // FillTypeLibInfo - rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl - << "\t sal_uInt16 * pMajor," << endl - << "\t sal_uInt16 * pMinor ) const" << endl - << '{' << endl - << "\tSvGlobalName aN( " << rtl::OUStringToOString(pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " );" << endl; - rOutStm << "\t*pGN = aN;" << endl - << "\t*pMajor = " - << rtl::OString::valueOf(static_cast(pMod->GetVersion().GetMajorVersion())).getStr() - << ';' << endl - << "\t*pMinor = " - << rtl::OString::valueOf(static_cast(pMod->GetVersion().GetMinorVersion())).getStr() - << ';' << endl - << "\treturn sal_True;" << endl - << '}' << endl; - - // FillTypeLibInfo - rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( ByteString * pName," - << "\t sal_uInt16 * pMajor," << endl - << "\t sal_uInt16 * pMinor ) const" << endl; - rOutStm << '{' << endl - << "\t*pName = \"" << pMod->GetTypeLibFileName().getStr() << "\";" << endl - << "\t*pMajor = " - << rtl::OString::valueOf(static_cast(pMod->GetVersion().GetMajorVersion())).getStr() - << ';' << endl - << "\t*pMinor = " - << rtl::OString::valueOf(static_cast(pMod->GetVersion().GetMinorVersion())).getStr() - << ';' << endl - << "\treturn sal_True;" << endl - << '}' << endl; - - rOutStm << "void " << name.getStr() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl - << '{' << endl - << "\t" << pSup << "::Notify( rBC, rHint );" << endl - << '}' << endl; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 8742c12cb489..cedd9be220f5 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -1495,83 +1495,6 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const rtl::OString& rShellName, sal_uInt16 return nSCount; } -void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pTable ) -{ - if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() ) - return; - - sal_uLong nSId = GetSlotId().GetValue(); - if( !pTable->IsKeyValid( nSId ) ) - { - pTable->Insert( nSId, this ); - rOutStm << "SfxSlotInfo " - << rtl::OString::valueOf(static_cast(nSId)).getStr() - << endl << '{' << endl; - - WriteTab( rOutStm, 1 ); - rtl::OString aStr = GetConfigName().getString(); - if( aStr.isEmpty() ) - aStr = GetName().getString(); - - rOutStm << "SlotName = \"" << aStr.getStr() << "\";" << endl; - - aStr = GetHelpText().getString(); - if( !aStr.isEmpty() ) - { - WriteTab( rOutStm, 1 ); - rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl; - } - - rOutStm << "};" << endl; - } - - SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() ); - if( GetPseudoSlots() && pEnum ) - { - for( sal_uLong n = 0; n < pEnum->Count(); n++ ) - { - rtl::OString aValName = pEnum->GetObject( n )->GetName().getString(); - rtl::OStringBuffer aBuf; - if( !GetPseudoPrefix().isEmpty() ) - aBuf.append(GetPseudoPrefix()); - else - aBuf.append(GetSlotId().getString()); - aBuf.append('_'); - aBuf.append(aValName.copy(pEnum->GetPrefix().getLength())); - - rtl::OString aSId = aBuf.makeStringAndClear(); - - sal_uLong nSId2; - sal_Bool bIdOk = sal_False; - if( rBase.FindId( aSId, &nSId2 ) ) - { - aSId = rtl::OString::valueOf(static_cast(nSId2)); - bIdOk = sal_True; - } - - // if id not found, write always - if( !bIdOk || !pTable->IsKeyValid( nSId2 ) ) - { - pTable->Insert( nSId2, this ); - rOutStm << "SfxSlotInfo " << aSId.getStr() - << endl << '{' << endl; - - WriteTab( rOutStm, 1 ); - rOutStm << "SlotName = \"" << aValName.getStr() << "\";" << endl; - - rtl::OString aStr = GetHelpText().getString(); - if (!aStr.isEmpty()) - { - WriteTab( rOutStm, 1 ); - rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl; - } - rOutStm << "};" << endl; - } - } - } -} - void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, Table * pTable ) { diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 391cdaba8c43..5b53d96009b8 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -740,10 +740,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const rtl::OString&, SvIdlData { } -void SvMetaAttribute::WriteSrc( SvIdlDataBase &, SvStream &, Table * ) -{ -} - void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, Table * ) { } -- cgit