diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-14 11:07:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-14 12:08:31 +0000 |
| commit | 60cf5b57b0cf12cad3406289e261d637c20f20d9 (patch) | |
| tree | 73fb7d8f601d65ca93c8b57b21556223b7bd153a /svl | |
| parent | 66c62ca16d1faa1bdb21757dc1abb8752df53293 (diff) | |
callcatcher: update list
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/rngitem.hxx | 11 | ||||
| -rw-r--r-- | svl/source/items/rngitem.cxx | 6 | ||||
| -rw-r--r-- | svl/source/items/rngitem_inc.cxx | 14 |
3 files changed, 2 insertions, 29 deletions
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 02eeb06b10e6..3f652633a04b 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -38,16 +38,6 @@ #undef SfxXRangeItem #undef SfxXRangesItem -#ifndef _SFXITEMS_HXX -#define NUMTYPE sal_uLong -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include <svl/rngitem.hxx> -#undef NUMTYPE -#undef SfxXRangeItem -#undef SfxXRangesItem -#endif - #define _SFXRNGITEM_HXX #else @@ -94,7 +84,6 @@ private: public: TYPEINFO(); SfxXRangesItem(); - SfxXRangesItem( sal_uInt16 nWID, const NUMTYPE *pRanges ); SfxXRangesItem( sal_uInt16 nWID, SvStream &rStream ); SfxXRangesItem( const SfxXRangesItem& rItem ); virtual ~SfxXRangesItem(); 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 ) |