diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-07 00:57:49 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-07 02:40:28 +0200 |
| commit | 0d8c345bf916ef7c1148bda84968c57189e14f5c (patch) | |
| tree | ea8076841d635bad8eb8f34426b7c88e0e30bd0d /svl/inc | |
| parent | 2d299c9867a8653fd52a23567a8ddc51ea1ffaf4 (diff) | |
kill TF_POOLABLE, step 1: error if unset
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/itempool.hxx | 10 | ||||
| -rw-r--r-- | svl/inc/svl/slstitm.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index a3a543e5bf2e..03f17afd0a45 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -114,7 +114,7 @@ class SVL_DLLPUBLIC SfxItemPool #ifdef TF_POOLABLE const SfxItemInfo* pItemInfos; #else - sal_uInt16* pSlotIds; +#error "TF_POOLABLE should always be set." #endif SfxItemPool_Impl* pImp; SfxPoolItem** ppStaticDefaults; @@ -164,10 +164,12 @@ public: sal_uInt16 nStart, sal_uInt16 nEnd, #ifdef TF_POOLABLE const SfxItemInfo *pItemInfos, +#else +#error "TF_POOLABLE should always be set." #endif SfxPoolItem **pDefaults = 0, #ifndef TF_POOLABLE - sal_uInt16 *pSlotIds = 0, +#error "TF_POOLABLE should always be set." #endif bool bLoadRefCounts = true ); protected: @@ -246,9 +248,7 @@ public: void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } #else - int HasMap() const { return 0 != pSlotIds; } - void SetMap( sal_uInt16 *pNewSlotIds ) - { pSlotIds = pNewSlotIds; } +#error "TF_POOLABLE should always be set." #endif sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const; sal_uInt16 GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep = sal_True ) const; diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index 18dff4091205..ed0a1151eaa5 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -56,7 +56,7 @@ public: const std::vector<String>& GetList() const; #ifndef TF_POOLABLE - virtual int IsPoolable() const; +#error "TF_POOLABLE should always be set." #endif // String-Separator: \n |