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 /sw/source | |
parent | operator ==, != should return bool (diff) | |
download | core-d1043892df97078546bf9c5ac697bcb65b457cc9.tar.gz core-d1043892df97078546bf9c5ac697bcb65b457cc9.zip |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'sw/source')
25 files changed, 70 insertions, 70 deletions
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 43de12c3a5ca..a18ff554afa3 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -40,7 +40,7 @@ SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, sal_Bool bFlag ) { } -int SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const +bool SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "no matching attributes" ); return GetValue() == ( (SwTblBoxNumFormat&) rAttr ).GetValue() && @@ -63,7 +63,7 @@ SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula ) { } -int SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const +bool SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return GetFormula() == ( (SwTblBoxFormula&) rAttr ).GetFormula() && @@ -210,7 +210,7 @@ SwTblBoxValue::SwTblBoxValue( const double nVal ) { } -int SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const +bool SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "SwTblBoxValue: item not equal" ); SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) ); diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index b510162f7a45..7b8fd3b25e2b 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -48,7 +48,7 @@ SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=( const SwFmtWr return *this; } -int SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& _rAttr ) const +bool SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& _rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( _rAttr ), "no matching attributes" ); return ( mnWrapInfluenceOnPosition == diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 24254516d8ac..bb28086ce0b9 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -118,7 +118,7 @@ SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch ) } // "Overhead" of SfxPoolItem -int SwMsgPoolItem::operator==( const SfxPoolItem& ) const +bool SwMsgPoolItem::operator==( const SfxPoolItem& ) const { OSL_FAIL( "SwMsgPoolItem knows no ==" ); return 0; diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 2ab9fe8362a2..be84f4083d88 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -55,7 +55,7 @@ sal_uInt16 SwMirrorGrf::GetValueCount() const return RES_MIRROR_GRAPH_END - RES_MIRROR_GRAPH_BEGIN; } -int SwMirrorGrf::operator==( const SfxPoolItem& rItem) const +bool SwMirrorGrf::operator==( const SfxPoolItem& rItem) const { return SfxEnumItem::operator==(rItem) && ((SwMirrorGrf&)rItem).IsGrfToggle() == IsGrfToggle(); @@ -171,7 +171,7 @@ SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const return new SwRotationGrf( GetValue(), aUnrotatedSize ); } -int SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const +bool SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const { return SfxUInt16Item::operator==( rCmp ) && GetUnrotatedSize() == ((SwRotationGrf&)rCmp).GetUnrotatedSize(); @@ -235,7 +235,7 @@ SfxPoolItem* SwGammaGrf::Clone( SfxItemPool * ) const // SwGammaGrf -int SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const +bool SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const { return SfxPoolItem::operator==( rCmp ) && nValue == ((SwGammaGrf&)rCmp).GetValue(); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4305eb899879..ca7f67f2583e 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -189,7 +189,7 @@ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy ) return *this; } -int SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return( eFrmHeightType == ((SwFmtFrmSize&)rAttr).eFrmHeightType && @@ -438,7 +438,7 @@ SwFmtHeader::SwFmtHeader( sal_Bool bOn ) DelHFFormat( this, GetHeaderFmt() ); } -int SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetRegisteredIn() == ((SwFmtHeader&)rAttr).GetRegisteredIn() && @@ -490,7 +490,7 @@ void SwFmtFooter::RegisterToFormat( SwFmt& rFmt ) rFmt.Add(this); } -int SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetRegisteredIn() == ((SwFmtFooter&)rAttr).GetRegisteredIn() && @@ -529,7 +529,7 @@ void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx ) pStartNode = pIdx ? new SwNodeIndex( *pIdx ) : 0; } -int SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); if( (sal_IntPtr)pStartNode ^ (sal_IntPtr)((SwFmtCntnt&)rAttr).pStartNode ) @@ -582,7 +582,7 @@ bool SwFmtPageDesc::KnowsPageDesc() const return (GetRegisteredIn() != 0); } -int SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) && @@ -810,7 +810,7 @@ SwFmtCol::SwFmtCol() { } -int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "no equal attributes" ); const SwFmtCol &rCmp = (const SwFmtCol&)rAttr; @@ -1096,7 +1096,7 @@ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) : bOutside = rCpy.bOutside; } -int SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( GetValue() == ((SwFmtSurround&)rAttr).GetValue() && @@ -1227,7 +1227,7 @@ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert, eRelation( eRel ) {} -int SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "not the same attributes" ); return ( nYPos == ((SwFmtVertOrient&)rAttr).nYPos && @@ -1314,7 +1314,7 @@ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori, bPosToggle( bPos ) {} -int SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( nXPos == ((SwFmtHoriOrient&)rAttr).nXPos && @@ -1457,7 +1457,7 @@ SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor) return *this; } -int SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); SwFmtAnchor const& rFmtAnchor(static_cast<SwFmtAnchor const&>(rAttr)); @@ -1633,7 +1633,7 @@ SwFmtURL::~SwFmtURL() delete pMap; } -int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const +bool SwFmtURL::operator==( const SfxPoolItem &rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "not the same attributes" ); const SwFmtURL &rCmp = (SwFmtURL&)rAttr; @@ -1816,7 +1816,7 @@ SwFmtFtnEndAtTxtEnd& SwFmtFtnEndAtTxtEnd::operator=( return *this; } -int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const +bool SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const { const SwFmtFtnEndAtTxtEnd& rAttr = (SwFmtFtnEndAtTxtEnd&)rItem; return SfxEnumItem::operator==( rAttr ) && @@ -1953,7 +1953,7 @@ SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const //class SwFmtChain -int SwFmtChain::operator==( const SfxPoolItem &rAttr ) const +bool SwFmtChain::operator==( const SfxPoolItem &rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); @@ -2032,7 +2032,7 @@ SwFmtLineNumber::~SwFmtLineNumber() { } -int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const +bool SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); @@ -2110,7 +2110,7 @@ SwTextGridItem::~SwTextGridItem() { } -int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const +bool SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return eGridType == ((SwTextGridItem&)rAttr).GetGridType() && diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index a93423e8c448..5a7ad4514a2b 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -115,7 +115,7 @@ bool SwFmtDrop::GetInfo( SfxPoolItem& ) const return true; // Continue } -int SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No mathing attributes" ); return ( nLines == ((SwFmtDrop&)rAttr).GetLines() && @@ -231,7 +231,7 @@ SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const { return new SwNumRuleItem( *this ); } -int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const +bool SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No matching attributes" ); diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 43be3a534902..3e8ddd363ab8 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -182,7 +182,7 @@ void SwTOXMark::RegisterToTOXType( SwTOXType& rMark ) rMark.Add(this); } -int SwTOXMark::operator==( const SfxPoolItem& rAttr ) const +bool SwTOXMark::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "Attributes are not the same" ); return GetRegisteredIn() == ((SwTOXMark&)rAttr).GetRegisteredIn(); diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 888633f315f4..d24a505a28d4 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -173,7 +173,7 @@ void SwFmtFld::ClearTxtFld() mpTxtFld = NULL; } -int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtFld::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return ( ( mpField && ((SwFmtFld&)rAttr).GetField() diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index b44d4914a3a7..0655d059d43d 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -42,7 +42,7 @@ SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt ) { } -int SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return( pTxtAttr && ((SwFmtFlyCnt&)rAttr).pTxtAttr && diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index 1d1645cf05f2..d3040217ff8c 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -128,7 +128,7 @@ SwFmtFtn::SwFmtFtn( bool bEndNote ) } -int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return m_nNumber == ((SwFmtFtn&)rAttr).m_nNumber && diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index 9c4196efccb1..e019c338742a 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -47,7 +47,7 @@ SwFmtRefMark::SwFmtRefMark( const SwFmtRefMark& rAttr ) { } -int SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return aRefName == ((SwFmtRefMark&)rAttr).aRefName; diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index b94e99d9945b..ab3d9a083b70 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -85,7 +85,7 @@ SwFmtCharFmt::~SwFmtCharFmt() {} -int SwFmtCharFmt::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtCharFmt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return GetCharFmt() == ((SwFmtCharFmt&)rAttr).GetCharFmt(); @@ -148,7 +148,7 @@ SwFmtAutoFmt::~SwFmtAutoFmt() { } -int SwFmtAutoFmt::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtAutoFmt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "different attributes" ); return mpHandle == ((SwFmtAutoFmt&)rAttr).mpHandle; @@ -230,7 +230,7 @@ SwFmtINetFmt::~SwFmtINetFmt() -int SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); bool bRet = SfxPoolItem::operator==( (SfxPoolItem&) rAttr ) @@ -468,7 +468,7 @@ SwFmtRuby& SwFmtRuby::operator=( const SwFmtRuby& rAttr ) return *this; } -int SwFmtRuby::operator==( const SfxPoolItem& rAttr ) const +bool SwFmtRuby::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); return sRubyTxt == ((SwFmtRuby&)rAttr).sRubyTxt && @@ -598,7 +598,7 @@ SwFmtMeta::~SwFmtMeta() } } -int SwFmtMeta::operator==( const SfxPoolItem & i_rOther ) const +bool SwFmtMeta::operator==( const SfxPoolItem & i_rOther ) const { OSL_ENSURE( SfxPoolItem::operator==( i_rOther ), "i just copied this assert" ); return SfxPoolItem::operator==( i_rOther ) diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 88b00191fe85..7378b4719b66 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -211,7 +211,7 @@ public: virtual ~SwFltAnchor(); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; void SetFrmFmt(SwFrmFmt * _pFrmFmt); const SwFrmFmt* GetFrmFmt() const; @@ -264,7 +264,7 @@ public: nAutorNoPrev( rCpy.nAutorNoPrev ) {} // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; }; @@ -286,7 +286,7 @@ public: SwFltBookmark( const SwFltBookmark& ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; long GetHandle() const { return mnHandle; } @@ -308,7 +308,7 @@ public: SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0); SwFltTOX(const SwFltTOX&); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; SwTOXBase* GetBase() { return pTOXBase; } sal_uInt16 GetCols() const { return nCols; } @@ -326,7 +326,7 @@ public: SwFltSection( SwSectionData *const pSect ); SwFltSection( const SwFltSection& ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; SwSectionData * GetSectionData() { return m_pSection; } }; diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index bc25dbe1f396..17d24bc0e383 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -885,7 +885,7 @@ SwFrmFmt * SwFltAnchor::GetFrmFmt() return pFrmFmt; } -int SwFltAnchor::operator==(const SfxPoolItem& rItem) const +bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const { return pFrmFmt == ((SwFltAnchor&)rItem).pFrmFmt; } @@ -919,7 +919,7 @@ void SwFltAnchorClient::Modify(const SfxPoolItem *, const SfxPoolItem * pNew) } //------ hier stehen die Methoden von SwFltRedline ----------- -int SwFltRedline::operator==(const SfxPoolItem& rItem) const +bool SwFltRedline::operator==(const SfxPoolItem& rItem) const { return this == &rItem; } @@ -960,7 +960,7 @@ SwFltBookmark::SwFltBookmark(const SwFltBookmark& rCpy) { } -int SwFltBookmark::operator==(const SfxPoolItem& rItem) const +bool SwFltBookmark::operator==(const SfxPoolItem& rItem) const { return ( maName == ((SwFltBookmark&)rItem).maName) && (mnHandle == ((SwFltBookmark&)rItem).mnHandle); @@ -985,7 +985,7 @@ SwFltTOX::SwFltTOX(const SwFltTOX& rCpy) { } -int SwFltTOX::operator==(const SfxPoolItem& rItem) const +bool SwFltTOX::operator==(const SfxPoolItem& rItem) const { return pTOXBase == ((SwFltTOX&)rItem).pTOXBase; } @@ -1009,7 +1009,7 @@ SwFltSection::SwFltSection(const SwFltSection& rCpy) { } -int SwFltSection::operator==(const SfxPoolItem& rItem) const +bool SwFltSection::operator==(const SfxPoolItem& rItem) const { return m_pSection == ((SwFltSection&)rItem).m_pSection; } diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 403949511fa1..51ed002e0e46 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -156,7 +156,7 @@ SfxPoolItem* SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwCondCollItem(*this); } -int SwCondCollItem::operator==( const SfxPoolItem& rItem) const +bool SwCondCollItem::operator==( const SfxPoolItem& rItem) const { OSL_ENSURE( SfxPoolItem::operator==(rItem), "different types" ); sal_Bool bReturn = sal_True; diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 40cc1bcc0fc2..1e5437a81679 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -79,7 +79,7 @@ SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const return new SwDocDisplayItem( *this ); } -int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const +bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "different types" ); @@ -170,7 +170,7 @@ SfxPoolItem* SwElemItem::Clone( SfxItemPool* ) const return new SwElemItem( *this ); } -int SwElemItem::operator==( const SfxPoolItem& rAttr ) const +bool SwElemItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "different types" ); @@ -257,7 +257,7 @@ SfxPoolItem* SwAddPrinterItem::Clone( SfxItemPool* ) const return new SwAddPrinterItem( *this ); } -int SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const +bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "different types" ); @@ -297,7 +297,7 @@ SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const return new SwShadowCursorItem( *this ); } -int SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const +bool SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const { return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() && GetMode() == ((SwShadowCursorItem&)rCmp).GetMode(); @@ -337,7 +337,7 @@ SfxPoolItem* SwTestItem::Clone( SfxItemPool* ) const return new SwTestItem( *this ); } -int SwTestItem::operator==( const SfxPoolItem& rAttr ) const +bool SwTestItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "different types" ); diff --git a/sw/source/ui/dialog/swwrtshitem.cxx b/sw/source/ui/dialog/swwrtshitem.cxx index 85df90bcce92..591a6b5403f5 100644 --- a/sw/source/ui/dialog/swwrtshitem.cxx +++ b/sw/source/ui/dialog/swwrtshitem.cxx @@ -30,7 +30,7 @@ SwWrtShellItem::SwWrtShellItem( const SwWrtShellItem& rItem) : { } -int SwWrtShellItem::operator==( const SfxPoolItem& rItem) const +bool SwWrtShellItem::operator==( const SfxPoolItem& rItem) const { return ((SwWrtShellItem&)rItem).pWrtSh == pWrtSh; } diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index d834265f8ad3..d6475903b588 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -148,7 +148,7 @@ SwEnvItem& SwEnvItem::operator =(const SwEnvItem& rItem) return *this; } -int SwEnvItem::operator ==(const SfxPoolItem& rItem) const +bool SwEnvItem::operator ==(const SfxPoolItem& rItem) const { const SwEnvItem& rEnv = (const SwEnvItem&) rItem; diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 50d319d24348..c381b764e0a9 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -123,7 +123,7 @@ SwLabItem& SwLabItem::operator =(const SwLabItem& rItem) return *this; } -int SwLabItem::operator ==(const SfxPoolItem& rItem) const +bool SwLabItem::operator ==(const SfxPoolItem& rItem) const { const SwLabItem& rLab = (const SwLabItem&) rItem; diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 2f96386b5ce5..af77a7667f71 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -71,7 +71,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -109,7 +109,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwElemItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -133,7 +133,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } @@ -178,7 +178,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -217,7 +217,7 @@ public: SwTestItem( const SwTestItem& pTestItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; }; #endif diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index 568bca501d55..9c766e11acea 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -63,7 +63,7 @@ public: SwEnvItem& operator =(const SwEnvItem& rItem); - virtual int operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx index e4f144afae8d..d668383efb68 100644 --- a/sw/source/ui/inc/labimg.hxx +++ b/sw/source/ui/inc/labimg.hxx @@ -37,7 +37,7 @@ public: SwLabItem& operator =(const SwLabItem& rItem); - virtual int operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx index a9b08ffd6c96..1cf1431732ec 100644 --- a/sw/source/ui/inc/swwrtshitem.hxx +++ b/sw/source/ui/inc/swwrtshitem.hxx @@ -34,7 +34,7 @@ public: SwWrtShellItem( const SwWrtShellItem& ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx index 4f066abe5e97..033adf755882 100644 --- a/sw/source/ui/inc/uiitems.hxx +++ b/sw/source/ui/inc/uiitems.hxx @@ -42,7 +42,7 @@ public: ~SwPageFtnInfoItem(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - 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: SwPtrItem( const SwPtrItem& rItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetValue(void * pPtr) { pMisc= pPtr; } void* GetValue() const { return pMisc; } @@ -82,7 +82,7 @@ public: virtual ~SwUINumRuleItem(); 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 ); @@ -108,7 +108,7 @@ public: SwPaMItem( const SwPaMItem& rItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetValue(SwPaM * pPaM) { m_pPaM= pPaM; } SwPaM* GetValue() const { return m_pPaM; } diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index aa15e18d05b1..d5f3bc62e93c 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -53,7 +53,7 @@ SfxPoolItem* SwPageFtnInfoItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwPageFtnInfoItem( *this ); } -int SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const +bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( Which() == rAttr.Which(), "no equal attributes" ); return ( aFtnInfo == ((SwPageFtnInfoItem&)rAttr).GetPageFtnInfo()); @@ -223,7 +223,7 @@ SfxPoolItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwPtrItem( *this ); } -int SwPtrItem::operator==( const SfxPoolItem& rAttr ) const +bool SwPtrItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); const SwPtrItem& rItem = (SwPtrItem&)rAttr; @@ -253,7 +253,7 @@ SfxPoolItem* SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwUINumRuleItem( *this ); } -int SwUINumRuleItem::operator==( const SfxPoolItem& rAttr ) const +bool SwUINumRuleItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); return *pRule == *((SwUINumRuleItem&)rAttr).pRule; @@ -307,7 +307,7 @@ SfxPoolItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwPaMItem( *this ); } -int SwPaMItem::operator==( const SfxPoolItem& rAttr ) const +bool SwPaMItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); const SwPaMItem& rItem = (SwPaMItem&)rAttr; |