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 /include/sfx2 | |
parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/app.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/evntconf.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/fcontnr.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/frame.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/frmdescr.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/minfitem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objitem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/tplpitem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/zoomitem.hxx | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 6827ce6c4b6a..5a5cf36a2741 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -106,7 +106,7 @@ class SfxLinkItem : public SfxPoolItem public: virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const { return new SfxLinkItem( *this ); } - virtual int operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const { return ((SfxLinkItem&)rL).aLink == aLink; } SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index a4d6acd7e90f..f13514d21dc3 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -171,7 +171,7 @@ public: void SetCmisProperties(::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > cmisProps ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) 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/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 6a1a59979e2e..8cdd19ea22c6 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -78,7 +78,7 @@ public: SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} - 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/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 3e8ee6882d6e..ad04fde0b664 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -51,7 +51,7 @@ class SfxRefItem : public SfxPoolItem public: virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const { return new SfxRefItem( *this ); } - virtual int operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const { return ((SfxRefItem&)rL).aRef == aRef; } SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) { aRef = rValue; } diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 73d10565422d..9512f2140a1c 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -239,7 +239,7 @@ public: SfxFrameItem( SfxFrame *p=0 ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -260,7 +260,7 @@ public: SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny ); ::com::sun::star::uno::Any GetValue() const { return aValue; } - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 ); @@ -278,7 +278,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 7837849f8768..bd8a2b0eafbf 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -237,7 +237,7 @@ public: virtual ~SfxFrameDescriptorItem(); - virtual int operator ==( const SfxPoolItem& ) const; + virtual bool operator ==( const SfxPoolItem& ) const; SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 83e023b74ed2..85b855bed684 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -46,7 +46,7 @@ public: SfxMacroInfoItem( const SfxMacroInfoItem& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; OUString GetComment() const { return aCommentText; } void SetComment( const OUString& r ) diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index d801df97ec8c..bee41067faf8 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -35,7 +35,7 @@ public: TYPEINFO(); SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; SfxShell* GetShell() const diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index de041fbf3bc7..7477963bebfa 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -789,7 +789,7 @@ public: pObjSh( pObjShell ) {} - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 30fa06ea2dbe..b8e664ce31ed 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -40,7 +40,7 @@ public: const OUString& GetStyleName() const { return aStyle; } virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual sal_uInt8 GetFlagCount() 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/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index cf316b7d0554..8c245ab1946c 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -303,7 +303,7 @@ public: pFrame( pViewFrame) {} - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -323,7 +323,7 @@ public: SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index df1a0dbd7913..10181da20678 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -61,7 +61,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) 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 ); }; |