diff options
| -rw-r--r-- | include/svl/itemset.hxx | 4 | ||||
| -rw-r--r-- | svl/source/items/itemset.cxx | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index a070eab2dfc1..c3710dbd5961 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -31,8 +31,6 @@ class SvStream; typedef SfxPoolItem const** SfxItemArray; -#define USHORT_ARG int - class SVL_DLLPUBLIC SfxItemSet { friend class SfxItemIter; @@ -69,7 +67,7 @@ public: SfxItemSet( SfxItemPool&, bool bTotalPoolRanges = false ); SfxItemSet( SfxItemPool&, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); - SfxItemSet( SfxItemPool&, USHORT_ARG nWh1, USHORT_ARG nWh2, USHORT_ARG nNull, ... ); + SfxItemSet( SfxItemPool&, int nWh1, int nWh2, int nNull, ... ); SfxItemSet( SfxItemPool&, const sal_uInt16* nWhichPairTable ); virtual ~SfxItemSet(); diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 1e72cf67e21e..6272a748eb0d 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -138,8 +138,7 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2 memset(static_cast<void*>(m_pItems), 0, sizeof(SfxPoolItem*) * nSize); } -SfxItemSet::SfxItemSet(SfxItemPool& rPool, - USHORT_ARG nWh1, USHORT_ARG nWh2, USHORT_ARG nNull, ...) +SfxItemSet::SfxItemSet(SfxItemPool& rPool, int nWh1, int nWh2, int nNull, ...) : m_pPool( &rPool ) , m_pParent(nullptr) , m_pWhichRanges(nullptr) |