diff options
Diffstat (limited to 'idl/inc/object.hxx')
-rw-r--r-- | idl/inc/object.hxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 377c5bf0a959..ac9d193d4d83 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -49,9 +49,9 @@ DECLARE_LIST( SvMetaClassList, SvMetaClass* ) class SvULongs : public List { public: - void Insert( ULONG& rId, ULONG nPos ) { ULONG nId(rId ); List::Insert( (void*) nId, nPos ); } - void Remove( ULONG& rId ){ ULONG nId(rId ); List::Remove( (void*) nId ); } - ULONG GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); } + void Insert( sal_uIntPtr& rId, sal_uIntPtr nPos ) { sal_uIntPtr nId(rId ); List::Insert( (void*) nId, nPos ); } + void Remove( sal_uIntPtr& rId ){ sal_uIntPtr nId(rId ); List::Remove( (void*) nId ); } + sal_uIntPtr GetObject( sal_uIntPtr nPos ){ return (sal_uIntPtr) List::GetObject( nPos ); } }; /******************** class SvClassElement *******************************/ @@ -70,9 +70,9 @@ public: const ByteString & GetPrefix() const { return aPrefix; } - void SetAutomation( BOOL rAutomation ) + void SetAutomation( sal_Bool rAutomation ) { aAutomation = rAutomation; } - BOOL GetAutomation() const + sal_Bool GetAutomation() const { return aAutomation; } void SetClass( SvMetaClass * pClass ) @@ -97,18 +97,18 @@ class SvMetaClass : public SvMetaType // void FillSbxMemberObject( SvIdlDataBase & rBase, // SbxObject *, StringList &, -// BOOL bVariable ); - BOOL TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, +// sal_Bool bVariable ); + sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, SvMetaAttribute & rAttr ) const; #ifdef IDL_COMPILER void WriteSlotStubs( const ByteString & rShellName, SvSlotElementList & rSlotList, ByteStringList & rList, SvStream & rOutStm ); - USHORT WriteSlotParamArray( SvIdlDataBase & rBase, + sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase, SvSlotElementList & rSlotList, SvStream & rOutStm ); - USHORT WriteSlots( const ByteString & rShellName, USHORT nCount, + sal_uInt16 WriteSlots( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList & rSlotList, SvIdlDataBase & rBase, SvStream & rOutStm ); @@ -121,21 +121,21 @@ protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ); virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, USHORT nTab ); + SvStream & rOutStm, sal_uInt16 nTab ); virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteContextSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, USHORT nTab ); + SvStream & rOutStm, sal_uInt16 nTab ); void WriteOdlMembers( ByteStringList & rSuperList, - BOOL bVariable, BOOL bWriteTab, + sal_Bool bVariable, sal_Bool bWriteTab, SvIdlDataBase & rBase, - SvStream & rOutStm, USHORT nTab ); + SvStream & rOutStm, sal_uInt16 nTab ); #endif public: SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 ) SvMetaClass(); - BOOL GetAutomation() const + sal_Bool GetAutomation() const { return aAutomation; } SvMetaClass * GetSuperClass() const { return aSuperClass; } @@ -148,18 +148,18 @@ public: { return aClassList; } #ifdef IDL_COMPILER - virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab, + sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); 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, USHORT nTab ); - virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab ); + virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); #endif }; SV_IMPL_REF(SvMetaClass) |