diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-09 10:13:55 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-12-09 10:13:55 +0100 |
| commit | 9103c81b03961788743d6248099f6a7f35f735d9 (patch) | |
| tree | 693b2ab70bacc925b9dbf01a2ed0db5e0911d7f8 /svl/inc/svl/itempool.hxx | |
| parent | 38440ad6b24f618923a48d722a861f78c1715be5 (diff) | |
| parent | a5509a421f2f3d43aad1ba5d32e6c7bf1c015b3b (diff) | |
mib19: rebase to DEV300m95
Diffstat (limited to 'svl/inc/svl/itempool.hxx')
| -rw-r--r-- | svl/inc/svl/itempool.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index cbc6b7c4dd11..daaa2b481ba3 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -104,7 +104,7 @@ class SVL_DLLPUBLIC SfxItemPool */ { - SVL_DLLPRIVATE void readTheItems(SvStream & rStream, USHORT nCount, USHORT nVersion, + SVL_DLLPRIVATE void readTheItems(SvStream & rStream, sal_uInt32 nCount, USHORT nVersion, SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** pArr); UniString aName; @@ -208,9 +208,9 @@ public: const SfxPoolItem &rItem, FASTBOOL bDirect = FALSE ) const; - USHORT GetSurrogate(const SfxPoolItem *) const; - const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const; - USHORT GetItemCount(USHORT nWhich) const; + sal_uInt32 GetSurrogate(const SfxPoolItem *) const; + const SfxPoolItem * GetItem2(USHORT nWhich, sal_uInt32 nSurrogate) const; + sal_uInt32 GetItemCount2(USHORT nWhich) const; const SfxPoolItem* LoadSurrogate(SvStream& rStream, USHORT &rWhich, USHORT nSlotId, const SfxItemPool* pRefPool = 0 ); |