include/svl/itemset.hxx | 4 +---
svl/source/items/itemset.cxx | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 4e097c10105759357932da8073a82df408c1f165
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Oct 20 09:13:33 2015 +0200
sfx items: No need to confuse with 'USHORT_ARG' that is an 'int'.
Change-Id: I61326bc52a5da527930810ff4516c707c31d1fde
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index a070eab..c3710db 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 1e72cf6..6272a74 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
