summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-10 17:01:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-10 17:11:51 +0100
commitd1043892df97078546bf9c5ac697bcb65b457cc9 (patch)
tree0219c41b945daaf4ce8e4b6c40b2c2b33a4c9536 /include/svl
parent02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff)
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too. Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/cenumitm.hxx4
-rw-r--r--include/svl/cintitem.hxx8
-rw-r--r--include/svl/cntwall.hxx2
-rw-r--r--include/svl/ctypeitm.hxx2
-rw-r--r--include/svl/custritm.hxx2
-rw-r--r--include/svl/eitem.hxx2
-rw-r--r--include/svl/flagitem.hxx2
-rw-r--r--include/svl/globalnameitem.hxx2
-rw-r--r--include/svl/grabbagitem.hxx2
-rw-r--r--include/svl/ilstitem.hxx2
-rw-r--r--include/svl/imageitm.hxx2
-rw-r--r--include/svl/intitem.hxx2
-rw-r--r--include/svl/lckbitem.hxx2
-rw-r--r--include/svl/macitem.hxx2
-rw-r--r--include/svl/poolitem.hxx18
-rw-r--r--include/svl/ptitem.hxx2
-rw-r--r--include/svl/rectitem.hxx2
-rw-r--r--include/svl/rngitem.hxx4
-rw-r--r--include/svl/slstitm.hxx2
-rw-r--r--include/svl/srchitem.hxx2
-rw-r--r--include/svl/szitem.hxx2
-rw-r--r--include/svl/visitem.hxx2
22 files changed, 35 insertions, 35 deletions
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 1444cdd1bce8..e9507292a1cf 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -38,7 +38,7 @@ protected:
public:
TYPEINFO();
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
@@ -74,7 +74,7 @@ public:
virtual void SetEnumValue(sal_uInt16 nValue) = 0;
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index a4d2e8e116e5..94d1ed2153e2 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -43,7 +43,7 @@ public:
virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -105,7 +105,7 @@ public:
virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -167,7 +167,7 @@ public:
virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -229,7 +229,7 @@ public:
virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index d6ef543342a0..3a398bc7d171 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -45,7 +45,7 @@ public:
virtual sal_uInt16 GetVersion(sal_uInt16) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const;
virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index a4bf8ccd66f9..2fa5f977b33f 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -41,7 +41,7 @@ public:
sal_uInt16 nItemVersion ) const;
virtual SvStream & Store(SvStream & rStream, sal_uInt16) const;
- virtual int operator==( const SfxPoolItem& rOrig ) const;
+ virtual bool operator==( const SfxPoolItem& rOrig ) const;
virtual sal_uInt16 GetVersion(sal_uInt16) const;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 0da93d6d31ed..4c7e658f4b94 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -47,7 +47,7 @@ public:
virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 51d2d67c9dc8..0feb03fd5a00 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -86,7 +86,7 @@ public:
void SetValue(bool const bTheValue) { m_bValue = bTheValue; }
// SfxPoolItem
- virtual int operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+ virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE;
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 36fdbecfa872..a5510a62d5f6 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -45,7 +45,7 @@ public:
virtual sal_uInt8 GetFlagCount() const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index f911bbf781b8..05385eac45c2 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -37,7 +37,7 @@ public:
SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
~SfxGlobalNameItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
SvGlobalName GetValue() const { return m_aName; }
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index e28f2134776b..0f3f763ece11 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -33,7 +33,7 @@ public:
void SetGrabBag(const std::map<OUString, com::sun::star::uno::Any>& rMap);
const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const;
- virtual int operator==(const SfxPoolItem&) const;
+ virtual bool operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0);
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index cc7c75a69635..a5d1d6beec38 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -45,7 +45,7 @@ public:
void GetList( ::std::vector < sal_Int32 >& rList ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index b36f7baa4966..dbedde8ac5e2 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -34,7 +34,7 @@ public:
virtual ~SfxImageItem();
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 6807a805cc70..0ca7c29e8060 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -60,7 +60,7 @@ public:
virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 779756580abf..102a851b095b 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -38,7 +38,7 @@ public:
SfxLockBytesItem( const SfxLockBytesItem& );
~SfxLockBytesItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 774453848994..0b5eb8202b29 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -137,7 +137,7 @@ public:
explicit inline SvxMacroItem ( const sal_uInt16 nId );
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index fc5d5bf7e6cd..37838caf542a 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -194,8 +194,8 @@ public:
sal_uInt16 Which() const {
DBG_CHKTHIS(SfxPoolItem, 0);
return m_nWhich; }
- virtual int operator==( const SfxPoolItem& ) const = 0;
- int operator!=( const SfxPoolItem& rItem ) const
+ virtual bool operator==( const SfxPoolItem& ) const = 0;
+ bool operator!=( const SfxPoolItem& rItem ) const
{ return !(*this == rItem); }
virtual int Compare( const SfxPoolItem &rWith ) const;
virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const;
@@ -301,27 +301,27 @@ inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const
// -----------------------------------------------------------------------
-inline int IsPoolDefaultItem(const SfxPoolItem *pItem )
+inline bool IsPoolDefaultItem(const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() == SFX_ITEMS_POOLDEFAULT;
}
-inline int IsStaticDefaultItem(const SfxPoolItem *pItem )
+inline bool IsStaticDefaultItem(const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() == SFX_ITEMS_STATICDEFAULT;
}
-inline int IsDefaultItem( const SfxPoolItem *pItem )
+inline bool IsDefaultItem( const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() >= SFX_ITEMS_STATICDEFAULT;
}
-inline int IsPooledItem( const SfxPoolItem *pItem )
+inline bool IsPooledItem( const SfxPoolItem *pItem )
{
return pItem && pItem->GetRefCount() > 0 && pItem->GetRefCount() <= SFX_ITEMS_MAXREF;
}
-inline int IsInvalidItem(const SfxPoolItem *pItem)
+inline bool IsInvalidItem(const SfxPoolItem *pItem)
{
return pItem == (SfxPoolItem *)-1;
}
@@ -338,7 +338,7 @@ public:
SfxVoidItem( const SfxVoidItem& );
~SfxVoidItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -366,7 +366,7 @@ public:
SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 );
~SfxSetItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 89e4684fcebc..dedcc29c8391 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -47,7 +47,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 19d900bb986b..c5a280b0fb38 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -48,7 +48,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 11f34031d8fd..069929e197b7 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -37,7 +37,7 @@ public:
SfxRangeItem();
SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
SfxRangeItem( const SfxRangeItem& rItem );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -66,7 +66,7 @@ public:
SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
virtual ~SfxUShortRangesItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index ea810f99205d..9481206fe939 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -53,7 +53,7 @@ public:
void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 037e6193c944..95cce8153122 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -83,7 +83,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int operator == ( const SfxPoolItem& ) const;
+ virtual bool operator == ( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 4f79db3c32ca..e75d432f5bab 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -47,7 +47,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 7aad26f8e7f7..7d98b199fa01 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -50,7 +50,7 @@ public:
virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;