diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-23 15:09:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-24 08:13:04 +0200 |
| commit | 2a19718575e4b9c5757da55ab64dd17ef7d3c9c4 (patch) | |
| tree | 39a7447c3260d5f6456cf17666c598f680e13be4 /svl | |
| parent | 4bb37f99811875179c2020e832542d3751a93312 (diff) | |
move SFX_ITEMS_DIRECT etc. definitions inside the module
These are internal constants, they don't need to be visible to the rest
of LO
Change-Id: I313def85b8c404948ec9ecb3996fed03b32ff9bf
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/inc/poolio.hxx | 4 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 5 | ||||
| -rw-r--r-- | svl/source/items/itemset.cxx | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 2dcd2cafdc46..80eaa18f60f8 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -33,6 +33,10 @@ class SfxItemPoolUser; #define DELETEZ(pPtr) { delete pPtr; pPtr = 0; } #endif +static const sal_uInt32 SFX_ITEMS_DIRECT = 0xffffffff; +static const sal_uInt32 SFX_ITEMS_NULL = 0xfffffff0; // instead StoreSurrogate +static const sal_uInt32 SFX_ITEMS_DEFAULT = 0xfffffffe; + struct SfxPoolVersion_Impl { sal_uInt16 _nVer; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 55084997e4a5..0638eec43d95 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -979,6 +979,11 @@ const sal_uInt16* SfxItemPool::GetFrozenIdRanges() const return pImp->mpPoolRanges; } +const SfxPoolItem *SfxItemPool::GetItem2Default(sal_uInt16 nWhich) const +{ + return GetItem2(nWhich, SFX_ITEMS_DEFAULT); +} + const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) const { if ( !IsInRange(nWhich) ) diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 3050442491a7..f773fb5afee7 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -41,6 +41,7 @@ static sal_uLong nRangesCopyCount = 0; // How often have ranges been copied? #endif #include "nranges.cxx" +#include "poolio.hxx" #ifdef DBG_UTIL |