diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-16 09:16:44 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-16 09:59:30 +0200 |
commit | 4aaa4ceee75de7a0fbb552039d39567ab10c6d4b (patch) | |
tree | 66496fd94be045be5bb83e49ffdb52bb52b118e2 /idl/inc | |
parent | 7f71e99e3f35e7b94aa426f588276d05bf86bf09 (diff) |
Remove more unused idl parts
Change-Id: Id78de487b36a1c939dc3a4a5b38ab0b77999478c
Diffstat (limited to 'idl/inc')
-rw-r--r-- | idl/inc/basobj.hxx | 26 | ||||
-rw-r--r-- | idl/inc/bastype.hxx | 29 | ||||
-rw-r--r-- | idl/inc/module.hxx | 5 | ||||
-rw-r--r-- | idl/inc/object.hxx | 7 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 3 | ||||
-rw-r--r-- | idl/inc/types.hxx | 34 |
6 files changed, 0 insertions, 104 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 5c0ac112565e..e35cc45c3fde 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -36,18 +36,6 @@ typedef SvMetaObject * (*CreateMetaObjectType)(); #define C_PREF "C_" -enum WriteType -{ - WRITE_C_HEADER, WRITE_C_SOURCE -}; - -enum -{ - WA_METHOD = 0x1, WA_VARIABLE = 0x2, WA_ARGUMENT = 0x4, - WA_STRUCT = 0x8, WA_READONLY = 0x10 -}; -typedef int WriteAttribute; - class SvMetaObject : public SvRttiBase { public: @@ -61,9 +49,6 @@ public: virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); - protected: virtual ~SvMetaObject() {} }; @@ -108,10 +93,6 @@ protected: virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ); - virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0); - virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0); public: TYPEINFO_OVERRIDE(); SvMetaName(); @@ -127,9 +108,6 @@ public: virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0) SAL_OVERRIDE; - void WriteDescription( SvStream& rOutStm ); }; typedef tools::SvRef<SvMetaName> SvMetaNameRef; @@ -204,12 +182,8 @@ public: void SetModule( SvIdlDataBase & rBase ); virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0) SAL_OVERRIDE; protected: virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0) SAL_OVERRIDE; }; typedef tools::SvRef<SvMetaExtern> SvMetaExternRef; diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 1d862843944c..e8da2c4b5af9 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -29,26 +29,6 @@ class SvStringHashEntry; class SvIdlDataBase; class SvTokenStream; -class SvUINT32 -{ - sal_uInt32 nVal; -public: - SvUINT32() { nVal = 0; } - SvUINT32( sal_uInt32 n ) : nVal( n ) {} - SvUINT32 & operator = ( sal_uInt32 n ) { nVal = n; return *this; } - - operator sal_uInt32 &() { return nVal; } - - static sal_uInt32 Read( SvStream & rStm ); - static void Write( SvStream & rStm, sal_uInt32 nVal ); - - friend SvStream& WriteSvUINT32(SvStream & rStm, const SvUINT32 & r ) - { SvUINT32::Write( rStm, r.nVal ); return rStm; } - friend SvStream& operator >> (SvStream & rStm, SvUINT32 & r ) - { r.nVal = SvUINT32::Read( rStm ); return rStm; } -}; - - class Svint { int nVal; @@ -61,11 +41,6 @@ public: operator int ()const { return nVal; } bool IsSet() const { return bSet; } - - friend SvStream& WriteSvint(SvStream & rStm, const Svint & r ) - { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm.WriteUInt8( r.bSet ); return rStm; } - friend SvStream& operator >> (SvStream & rStm, Svint & r ) - { r.nVal = (int)SvUINT32::Read( rStm ); rStm.ReadCharAsBool( r.bSet ); return rStm; } }; @@ -110,8 +85,6 @@ public: { return m_aStr; } - friend SvStream& WriteSvIdentifier(SvStream &, const SvIdentifier &); - friend SvStream& operator >> (SvStream &, SvIdentifier &); bool IsSet() const { @@ -135,8 +108,6 @@ public: sal_uInt32 GetValue() const { return nValue; } void SetValue( sal_uInt32 nVal ) { nValue = nVal; } - friend SvStream& WriteSvNumberIdentifier(SvStream &, const SvNumberIdentifier &); - friend SvStream& operator >> (SvStream &, SvNumberIdentifier &); bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName, SvTokenStream & rInStm ); diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index d37a86fb2183..92c11d6942ec 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -77,11 +77,6 @@ public: virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteAttributes( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); }; typedef tools::SvRef<SvMetaModule> SvMetaModuleRef; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 01ac607b2e4c..b0481a3ca796 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -102,10 +102,6 @@ protected: SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - void WriteOdlMembers( ByteStringList & rSuperList, - bool bVariable, bool bWriteTab, - SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); public: TYPEINFO_OVERRIDE(); SvMetaClass(); @@ -122,9 +118,6 @@ public: { return aClassList; } virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SAL_OVERRIDE; }; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 01ba419f7292..3014d327b8e4 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -73,9 +73,6 @@ class SvMetaSlot : public SvMetaAttribute SvSlotElementList &rList, size_t nStart, SvIdlDataBase & rBase, SvStream & rOutStm ); - virtual void Write( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; void SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; } diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index a73964bb4619..f53fb3156d28 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -45,12 +45,7 @@ class SvMetaAttribute : public SvMetaReference bool bNewAttr; protected: - virtual void WriteCSource( SvIdlDataBase & rBase, - SvStream & rOutStm, bool bSet ); sal_uLong MakeSlotValue( SvIdlDataBase & rBase, bool bVariable ) const; - virtual void WriteAttributes( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) SAL_OVERRIDE; public: @@ -97,13 +92,6 @@ public: virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType ); - void WriteRecursiv_Impl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute ); - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; sal_uLong MakeSfx( OStringBuffer& rAtrrArray ); virtual void Insert( SvSlotElementList&, const OString& rPrefix, SvIdlDataBase& ); @@ -143,11 +131,6 @@ protected: virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; - virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); public: TYPEINFO_OVERRIDE(); @@ -205,22 +188,13 @@ public: virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; OString GetCString() const; - void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); sal_uLong MakeSfx( OStringBuffer& rAtrrArray ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); bool ReadMethodArgs( SvIdlDataBase & rBase, SvTokenStream & rInStm ); - void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType ); - void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType ); - void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType ); OString GetParserString() const; - void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm, - const OString& rChief ); }; class SvMetaTypeMemberList : public SvRefMemberList<SvMetaType *> {}; @@ -242,8 +216,6 @@ public: SvMetaEnumValue(); virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef; @@ -255,8 +227,6 @@ class SvMetaTypeEnum : public SvMetaType OString aPrefix; protected: virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); SvMetaTypeEnum(); @@ -268,10 +238,6 @@ public: { return aEnumValueList[n]; } virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - - virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef; |