diff options
Diffstat (limited to 'svl/source/inc')
-rw-r--r-- | svl/source/inc/passwordcontainer.hxx | 6 | ||||
-rw-r--r-- | svl/source/inc/poolio.hxx | 92 |
2 files changed, 49 insertions, 49 deletions
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 375632801368..e03432906f5f 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -411,13 +411,13 @@ public: class RW_SvMemoryStream : public SvMemoryStream { public: - RW_SvMemoryStream( void* Buf, ULONG Size, StreamMode eMode ): + RW_SvMemoryStream( void* Buf, sal_uLong Size, StreamMode eMode ): SvMemoryStream( Buf, Size, eMode){} - RW_SvMemoryStream( ULONG InitSize=512, ULONG Resize=64 ): + RW_SvMemoryStream( sal_uLong InitSize=512, sal_uLong Resize=64 ): SvMemoryStream( InitSize, Resize ){} - ULONG getActualSize(){ return nEndOfData; } + sal_uLong getActualSize(){ return nEndOfData; } }; diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 79cbbc463700..013b6c760096 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -35,12 +35,12 @@ struct SfxPoolVersion_Impl { - USHORT _nVer; - USHORT _nStart, _nEnd; - USHORT* _pMap; + sal_uInt16 _nVer; + sal_uInt16 _nStart, _nEnd; + sal_uInt16* _pMap; - SfxPoolVersion_Impl( USHORT nVer, USHORT nStart, USHORT nEnd, - USHORT *pMap ) + SfxPoolVersion_Impl( sal_uInt16 nVer, sal_uInt16 nStart, sal_uInt16 nEnd, + sal_uInt16 *pMap ) : _nVer( nVer ), _nStart( nStart ), _nEnd( nEnd ), @@ -75,17 +75,17 @@ struct SfxItemPool_Impl SfxBroadcaster aBC; SfxPoolItemArray_Impl** ppPoolItems; SfxPoolVersionArr_Impl aVersions; - USHORT nVersion; - USHORT nLoadingVersion; - USHORT nInitRefCount; // 1, beim Laden ggf. 2 - USHORT nVerStart, nVerEnd; // WhichRange in Versions - USHORT nStoringStart, nStoringEnd; // zu speichernder Range - BYTE nMajorVer, nMinorVer; // Pool selbst + sal_uInt16 nVersion; + sal_uInt16 nLoadingVersion; + sal_uInt16 nInitRefCount; // 1, beim Laden ggf. 2 + sal_uInt16 nVerStart, nVerEnd; // WhichRange in Versions + sal_uInt16 nStoringStart, nStoringEnd; // zu speichernder Range + sal_uInt8 nMajorVer, nMinorVer; // Pool selbst SfxMapUnit eDefMetric; FASTBOOL bInSetItem; FASTBOOL bStreaming; // in Load() bzw. Store() - SfxItemPool_Impl( USHORT nStart, USHORT nEnd ) + SfxItemPool_Impl( sal_uInt16 nStart, sal_uInt16 nEnd ) : ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1]) { memset( ppPoolItems, 0, sizeof( SfxPoolItemArray_Impl* ) * ( nEnd - nStart + 1) ); @@ -126,76 +126,76 @@ struct SfxItemPool_Impl #endif #define CHECK_FILEFORMAT( rStream, nTag ) \ - { USHORT nFileTag; \ + { sal_uInt16 nFileTag; \ rStream >> nFileTag; \ if ( nTag != nFileTag ) \ { \ DBG_ERROR( #nTag ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ - pImp->bStreaming = FALSE; \ + pImp->bStreaming = sal_False; \ return rStream; \ } \ } #define CHECK_FILEFORMAT_RELEASE( rStream, nTag, pPointer ) \ - { USHORT nFileTag; \ + { sal_uInt16 nFileTag; \ rStream >> nFileTag; \ if ( nTag != nFileTag ) \ { \ DBG_ERROR( #nTag ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ - pImp->bStreaming = FALSE; \ + pImp->bStreaming = sal_False; \ delete pPointer; \ return rStream; \ } \ } #define CHECK_FILEFORMAT2( rStream, nTag1, nTag2 ) \ - { USHORT nFileTag; \ + { sal_uInt16 nFileTag; \ rStream >> nFileTag; \ if ( nTag1 != nFileTag && nTag2 != nFileTag ) \ { \ DBG_ERROR( #nTag1 ); /*! s.u. */ \ /*! error-code setzen und auswerten! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ - pImp->bStreaming = FALSE; \ + pImp->bStreaming = sal_False; \ return rStream; \ } \ } -#define SFX_ITEMPOOL_VER_MAJOR BYTE(2) -#define SFX_ITEMPOOL_VER_MINOR BYTE(0) - -#define SFX_ITEMPOOL_TAG_STARTPOOL_4 USHORT(0x1111) -#define SFX_ITEMPOOL_TAG_STARTPOOL_5 USHORT(0xBBBB) -#define SFX_ITEMPOOL_TAG_ITEMPOOL USHORT(0xAAAA) -#define SFX_ITEMPOOL_TAG_ITEMS USHORT(0x2222) -#define SFX_ITEMPOOL_TAG_ITEM USHORT(0x7777) -#define SFX_ITEMPOOL_TAG_SIZES USHORT(0x3333) -#define SFX_ITEMPOOL_TAG_DEFAULTS USHORT(0x4444) -#define SFX_ITEMPOOL_TAG_VERSIONMAP USHORT(0x5555) -#define SFX_ITEMPOOL_TAG_HEADER USHORT(0x6666) -#define SFX_ITEMPOOL_TAG_ENDPOOL USHORT(0xEEEE) -#define SFX_ITEMPOOL_TAG_TRICK4OLD USHORT(0xFFFF) - -#define SFX_ITEMPOOL_REC BYTE(0x01) -#define SFX_ITEMPOOL_REC_HEADER BYTE(0x10) -#define SFX_ITEMPOOL_REC_VERSIONMAP USHORT(0x0020) -#define SFX_ITEMPOOL_REC_WHICHIDS USHORT(0x0030) -#define SFX_ITEMPOOL_REC_ITEMS USHORT(0x0040) -#define SFX_ITEMPOOL_REC_DEFAULTS USHORT(0x0050) - -#define SFX_ITEMSET_REC BYTE(0x02) - -#define SFX_STYLES_REC BYTE(0x03) -#define SFX_STYLES_REC_HEADER USHORT(0x0010) -#define SFX_STYLES_REC_STYLES USHORT(0x0020) +#define SFX_ITEMPOOL_VER_MAJOR sal_uInt8(2) +#define SFX_ITEMPOOL_VER_MINOR sal_uInt8(0) + +#define SFX_ITEMPOOL_TAG_STARTPOOL_4 sal_uInt16(0x1111) +#define SFX_ITEMPOOL_TAG_STARTPOOL_5 sal_uInt16(0xBBBB) +#define SFX_ITEMPOOL_TAG_ITEMPOOL sal_uInt16(0xAAAA) +#define SFX_ITEMPOOL_TAG_ITEMS sal_uInt16(0x2222) +#define SFX_ITEMPOOL_TAG_ITEM sal_uInt16(0x7777) +#define SFX_ITEMPOOL_TAG_SIZES sal_uInt16(0x3333) +#define SFX_ITEMPOOL_TAG_DEFAULTS sal_uInt16(0x4444) +#define SFX_ITEMPOOL_TAG_VERSIONMAP sal_uInt16(0x5555) +#define SFX_ITEMPOOL_TAG_HEADER sal_uInt16(0x6666) +#define SFX_ITEMPOOL_TAG_ENDPOOL sal_uInt16(0xEEEE) +#define SFX_ITEMPOOL_TAG_TRICK4OLD sal_uInt16(0xFFFF) + +#define SFX_ITEMPOOL_REC sal_uInt8(0x01) +#define SFX_ITEMPOOL_REC_HEADER sal_uInt8(0x10) +#define SFX_ITEMPOOL_REC_VERSIONMAP sal_uInt16(0x0020) +#define SFX_ITEMPOOL_REC_WHICHIDS sal_uInt16(0x0030) +#define SFX_ITEMPOOL_REC_ITEMS sal_uInt16(0x0040) +#define SFX_ITEMPOOL_REC_DEFAULTS sal_uInt16(0x0050) + +#define SFX_ITEMSET_REC sal_uInt8(0x02) + +#define SFX_STYLES_REC sal_uInt8(0x03) +#define SFX_STYLES_REC_HEADER sal_uInt16(0x0010) +#define SFX_STYLES_REC_STYLES sal_uInt16(0x0020) //======================================================================== -inline USHORT SfxItemPool::GetIndex_Impl(USHORT nWhich) const +inline sal_uInt16 SfxItemPool::GetIndex_Impl(sal_uInt16 nWhich) const { DBG_CHKTHIS(SfxItemPool, 0); DBG_ASSERT(nWhich >= nStart && nWhich <= nEnd, "Which-Id nicht im Pool-Bereich"); |