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 /sfx2 | |
| parent | 2d299c9867a8653fd52a23567a8ddc51ea1ffaf4 (diff) | |
kill TF_POOLABLE, step 1: error if unset
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmain.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 54c07bd42822..0cce285c2146 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -86,6 +86,8 @@ static SfxItemInfo const aItemInfos[] = { { 0, 0 } }; +#else +#error "TF_POOLABLE should always be set." #endif //=================================================================== diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 92a11be0de38..257159427833 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1003,7 +1003,7 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) #ifdef TF_POOLABLE if ( pPool->IsSlot(nWhich) ) #else - if ( pPool->HasMap() && pPool->IsSlot(nWhich) ) +#error "TF_POOLABLE should always be set." #endif nWhich = pPool->GetWhich(nWhich); rSet.Put( rItem, nWhich ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 34caddf3b92d..8f2a39f415ac 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1642,7 +1642,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) //! Remove duplicated Ids? #ifndef TF_POOLABLE - if ( rPool.HasMap() ) +#error "TF_POOLABLE should always be set." #endif { nCount = aUS.Count(); |