diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:01:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:11:51 +0100 |
| commit | d1043892df97078546bf9c5ac697bcb65b457cc9 (patch) | |
| tree | 0219c41b945daaf4ce8e4b6c40b2c2b33a4c9536 /sd/source | |
| parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) | |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/core/sdattr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/optsitem.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/inc/optsitem.hxx | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index f337dd68ffdb..01dbe043dcfd 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -133,7 +133,7 @@ SfxPoolItem* DiaTimeItem::Clone( SfxItemPool* ) const } -int DiaTimeItem::operator==( const SfxPoolItem& rItem ) const +bool DiaTimeItem::operator==( const SfxPoolItem& rItem ) const { return( ( (DiaTimeItem&) rItem ).GetValue() == GetValue() ); } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index e96058820e17..9435add8da1d 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -347,7 +347,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==( rAttr ); DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different pool item type!" ); @@ -450,7 +450,7 @@ SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), different pool item type!" ); @@ -779,7 +779,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), different pool item type!" ); @@ -981,7 +981,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), different pool item type!" ); @@ -1511,7 +1511,7 @@ SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), different pool item type!" ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 05db6abaa6a1..d300734ea3ad 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -163,7 +163,7 @@ public: SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -196,7 +196,7 @@ public: SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -345,7 +345,7 @@ public: SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -414,7 +414,7 @@ public: SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -587,7 +587,7 @@ public: SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; |