diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2012-03-11 12:03:11 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 14:23:46 +0000 |
| commit | e516f134fac55a14b155fea70064e1c0553ea50c (patch) | |
| tree | cfb6f8f07e488a52ac58ad175d7fa9e9bf3831cf /idl/inc | |
| parent | dbd9198aa9d325dd5bbeb110cc8a3db57838d1e6 (diff) | |
Convert tools/table.hxx usage to std::map in IDL module
Along the way, convert the table parameter passing to using references since we are never passing
a null pointer.
Diffstat (limited to 'idl/inc')
| -rw-r--r-- | idl/inc/module.hxx | 2 | ||||
| -rw-r--r-- | idl/inc/object.hxx | 2 | ||||
| -rw-r--r-- | idl/inc/slot.hxx | 2 | ||||
| -rw-r--r-- | idl/inc/types.hxx | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 4e5953eff717..3a316050db0f 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -96,7 +96,7 @@ public: WriteType, WriteAttribute = 0 ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, - Table* pTable ); + HelpIdTable& rTable ); }; 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 1dd2cef9fefb..f23262d95189 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -140,7 +140,7 @@ public: WriteType, WriteAttribute = 0 ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, - Table* pTable ); + HelpIdTable& rTable ); }; SV_IMPL_REF(SvMetaClass) SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 3c00ca80e59b..d4ae0be1cab2 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -260,7 +260,7 @@ public: sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pIdTable ); + HelpIdTable& rIdTable ); virtual void WriteCSV( SvIdlDataBase&, SvStream& ); }; SV_DECL_IMPL_REF(SvMetaSlot) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 508f5a0c2963..b29a83cb4655 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -31,12 +31,15 @@ #include <rtl/strbuf.hxx> #include <tools/ref.hxx> -#include <tools/table.hxx> #include <basobj.hxx> +#include <map> struct SvSlotElement; typedef std::vector< SvSlotElement* > SvSlotElementList; +class SvMetaSlot; +typedef std::map<sal_uLong, SvMetaSlot*> HelpIdTable; + SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) SV_DECL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *) @@ -119,9 +122,9 @@ public: virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix, SvIdlDataBase& ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, - Table * pIdTable ); + HelpIdTable& rIdTable ); virtual void WriteCSV( SvIdlDataBase&, SvStream& ); - void FillIDTable(Table *pIDTable); + void FillIDTable(HelpIdTable& rIDTable); rtl::OString Compare( SvMetaAttribute *pAttr ); }; SV_IMPL_REF(SvMetaAttribute) |