mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move SFX_ITEMS_DIRECT etc. definitions inside the module

Browse Source 
These are internal constants, they don't need to be visible to the rest
of LO

Change-Id: I313def85b8c404948ec9ecb3996fed03b32ff9bf
This commit is contained in:
Noel Grandin
2014-07-23 15:09:14 +02:00
parent 4bb37f9981
commit 2a19718575
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/svl/itempool.hxx
View File

@@ -163,6 +163,7 @@ public:
sal_uInt32 GetSurrogate(const SfxPoolItem *) const; sal_uInt32 GetSurrogate(const SfxPoolItem *) const;
const SfxPoolItem * GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const; const SfxPoolItem * GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const;
const SfxPoolItem * GetItem2Default(sal_uInt16 nWhich) const;
sal_uInt32 GetItemCount2(sal_uInt16 nWhich) const; sal_uInt32 GetItemCount2(sal_uInt16 nWhich) const;
const SfxPoolItem* LoadSurrogate(SvStream& rStream, const SfxPoolItem* LoadSurrogate(SvStream& rStream,
sal_uInt16 &rWhich, sal_uInt16 nSlotId, sal_uInt16 &rWhich, sal_uInt16 nSlotId,

4
include/svl/poolitem.hxx
View File

@@ -37,10 +37,6 @@ class IntlWrapper;
namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
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;
enum SfxItemKind { enum SfxItemKind {
SFX_ITEMS_NONE, SFX_ITEMS_NONE,
SFX_ITEMS_DELETEONIDLE, SFX_ITEMS_DELETEONIDLE,

2
sc/source/ui/unoobj/defltuno.cxx
View File

@@ -339,7 +339,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropert
if (pEntry->nWID) if (pEntry->nWID)
{ {
ScDocumentPool* pPool = pDocShell->GetDocument().GetPool(); ScDocumentPool* pPool = pDocShell->GetDocument().GetPool();
const SfxPoolItem* pItem = pPool->GetItem2( pEntry->nWID, SFX_ITEMS_DEFAULT ); const SfxPoolItem* pItem = pPool->GetItem2Default( pEntry->nWID );
if (pItem) if (pItem)
pItem->QueryValue( aRet, pEntry->nMemberId ); pItem->QueryValue( aRet, pEntry->nMemberId );
} }

4
svl/source/inc/poolio.hxx
View File

@@ -33,6 +33,10 @@ class SfxItemPoolUser;
#define DELETEZ(pPtr) { delete pPtr; pPtr = 0; } #define DELETEZ(pPtr) { delete pPtr; pPtr = 0; }
#endif #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 struct SfxPoolVersion_Impl
{ {
sal_uInt16 _nVer; sal_uInt16 _nVer;

5
svl/source/items/itempool.cxx
View File

@@ -979,6 +979,11 @@ const sal_uInt16* SfxItemPool::GetFrozenIdRanges() const
return pImp->mpPoolRanges; 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 const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) const
{ {
if ( !IsInRange(nWhich) ) if ( !IsInRange(nWhich) )

1
svl/source/items/itemset.cxx
View File

@@ -41,6 +41,7 @@ static sal_uLong nRangesCopyCount = 0; // How often have ranges been copied?
#endif #endif
#include "nranges.cxx" #include "nranges.cxx"
#include "poolio.hxx"
#ifdef DBG_UTIL #ifdef DBG_UTIL