diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-07 08:44:03 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-07 08:44:03 +0200 |
| commit | 10011d00a6566f095b463abaed51da86c3a1e1d3 (patch) | |
| tree | aa3650231fe45a350a1b8f795c5acd5a9a7ae838 /svl/inc | |
| parent | c8d7cb6bff57c26ab67faef1a15c2c9bd4a4f616 (diff) | |
kill TF_POOLABLE, step 2: remove dead code
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/itempool.hxx | 15 | ||||
| -rw-r--r-- | svl/inc/svl/poolitem.hxx | 1 | ||||
| -rw-r--r-- | svl/inc/svl/slstitm.hxx | 4 |
3 files changed, 0 insertions, 20 deletions
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 1711cef9871e..d6bf85ff5ba6 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -105,11 +105,7 @@ class SVL_DLLPUBLIC SfxItemPool { friend struct SfxItemPool_Impl; -#ifdef TF_POOLABLE const SfxItemInfo* pItemInfos; -#else -#error "TF_POOLABLE should always be set." -#endif SfxItemPool_Impl* pImp; public: @@ -147,15 +143,8 @@ public: sal_Bool bCloneStaticDefaults = sal_False ); SfxItemPool( const UniString &rName, 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 -#error "TF_POOLABLE should always be set." -#endif bool bLoadRefCounts = true ); protected: virtual ~SfxItemPool(); @@ -221,15 +210,11 @@ public: void Delete(); -#ifdef TF_POOLABLE bool IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; bool IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const { return IsItemFlag( rItem.Which(), nFlag ); } void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } -#else -#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; sal_uInt16 GetTrueWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const; diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 0101720da14d..3e4173279859 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -31,7 +31,6 @@ #include "svl/svldllapi.h" #include <com/sun/star/uno/Any.hxx> -#define TF_POOLABLE #include <sal/config.h> #include <tools/rtti.hxx> #include <limits.h> diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index ed0a1151eaa5..4c4a37be0e10 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -55,10 +55,6 @@ public: const std::vector<String>& GetList() const; -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif - // String-Separator: \n virtual void SetString( const XubString& ); virtual XubString GetString(); |