diff options
Diffstat (limited to 'svl/source/items')
-rw-r--r-- | svl/source/items/rngitem.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/rngitem_inc.cxx | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index de742d7677c5..924a5c26e063 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -36,12 +36,6 @@ #include <svl/rngitem.hxx> #include "rngitem_inc.cxx" -#define NUMTYPE sal_uInt32 -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include <svl/rngitem.hxx> -#include "rngitem_inc.cxx" - #else // We leave this condition just in case NUMTYPE has been defined externally to this diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx index 7c87cb71d85b..2ce985758434 100644 --- a/svl/source/items/rngitem_inc.cxx +++ b/svl/source/items/rngitem_inc.cxx @@ -108,7 +108,7 @@ SfxPoolItem* SfxXRangeItem::Clone(SfxItemPool *) const SfxPoolItem* SfxXRangeItem::Create(SvStream &rStream, sal_uInt16) const { - NUMTYPE nVon, nBis; + NUMTYPE nVon(0), nBis(0); rStream >> nVon; rStream >> nBis; return new SfxXRangeItem( Which(), nVon, nBis ); @@ -132,20 +132,10 @@ SfxXRangesItem::SfxXRangesItem() //------------------------------------------------------------------------- -SfxXRangesItem::SfxXRangesItem( sal_uInt16 nWID, const NUMTYPE *pRanges ) -: SfxPoolItem( nWID ) -{ - NUMTYPE nCount = Count_Impl(pRanges) + 1; - _pRanges = new NUMTYPE[nCount]; - memcpy( _pRanges, pRanges, sizeof(NUMTYPE) * nCount ); -} - -//------------------------------------------------------------------------- - SfxXRangesItem::SfxXRangesItem( sal_uInt16 nWID, SvStream &rStream ) : SfxPoolItem( nWID ) { - NUMTYPE nCount; + NUMTYPE nCount(0); rStream >> nCount; _pRanges = new NUMTYPE[nCount + 1]; for ( NUMTYPE n = 0; n < nCount; ++n ) |