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 | |
| parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) | |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'include')
101 files changed, 130 insertions, 130 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 7304e40095d4..b76a9b0ff35c 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -70,7 +70,7 @@ public: MediaItem( const MediaItem& rMediaItem ); virtual ~MediaItem(); - 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 eCoreUnit, diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 926f994a0f6d..642d036b0df7 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -54,7 +54,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 25adaf75a1ea..adc325f18aba 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -70,7 +70,7 @@ public: SvxBoxItem &operator=( const SvxBoxItem& rBox ); // "pure virtual Methods" from SfxPoolItem - 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 ); @@ -180,7 +180,7 @@ public: SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); // "pure virtual Methods" from 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/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 10339ac9c7dd..d31e6377823c 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -85,7 +85,7 @@ public: SfxMapUnit ePresMetric, 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, sal_uInt8 nMemberId = 0 ); diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 7fca7a163586..ad6d473d5484 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -116,7 +116,7 @@ public: void SetScale( sal_uInt16 nNew ) { nScale = nNew; } virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) 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/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index ebf0bdf5cbd7..27b9433a6105 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -64,7 +64,7 @@ public: return *this; } - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; // our currently only degree values void SetTopToBotton() { SetValue( 2700 ); } diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 7d7c0238db23..0755f08740ab 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -49,7 +49,7 @@ public: ~SvxColorItem(); // "pure virtual Methods" from SfxPoolItem - 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 ); virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 0ab6da09daa4..6163545edaef 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -57,7 +57,7 @@ public: void SetValue( sal_uInt16 nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual int HasBoolValue() const; + virtual bool HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue( sal_Bool bVal ); diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 608d38b1ec16..d2a28ca39af0 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -52,7 +52,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from 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/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index e401ecc89274..4a3403a2349e 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -48,7 +48,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/flditem.hxx b/include/editeng/flditem.hxx index 34ff0b994d74..d7c8cdc02542 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -81,7 +81,7 @@ public: SvxFieldItem( const SvxFieldItem& rItem ); ~SvxFieldItem(); - 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 nVer ) const; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 3fa6ee22dd03..fe71e10b749c 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -48,7 +48,7 @@ public: const sal_uInt16 nId ); SvxFontListItem( const SvxFontListItem& rItem ); - 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/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index c28116265426..7264c3c6b175 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -54,7 +54,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index e05e2534a2eb..897abd6650af 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -44,7 +44,7 @@ public: inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 3b4e8ddbe870..71174df7dcfa 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 9509c73d9f7c..51f653931031 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -42,7 +42,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 7b46e47eb7b6..5d1cd576e610 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -49,7 +49,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index b20c0a2c605a..e85b9127bd87 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -48,7 +48,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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 1c81759a50c6..d56b26831bc9 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -70,7 +70,7 @@ public: inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index d04e876fab04..8bb2fadfa5ef 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -53,7 +53,7 @@ public: SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/numitem.hxx b/include/editeng/numitem.hxx index 067ae962ded2..cd5e83cde391 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -301,7 +301,7 @@ public: virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const; sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; SvxNumRule* GetNumRule() const {return pNumRule;} diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 954c79cbb1ec..55102d1184c3 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -48,7 +48,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > @@ -73,7 +73,7 @@ public: SfxHyphenRegionItem( const sal_uInt16 nId ); SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); - 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/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index d4b20b406b6c..d864b90a5d25 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -60,7 +60,7 @@ public: return *this; } - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; }; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 921908b29dd4..88a9651b0e72 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -55,7 +55,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 HasBoolValue() const; + virtual bool HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue( sal_Bool bVal ); diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index b107064189f9..de46da707296 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -45,7 +45,7 @@ public: inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 5c47b9b71bea..2415997f58be 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -52,7 +52,7 @@ public: inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 60e2bf9679fb..f3095b0e2964 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -44,7 +44,7 @@ public: inline SvxSizeItem& operator=( const SvxSizeItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index b2d8256084fa..5f47d6407997 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -146,7 +146,7 @@ public: } // "pure virtual Methods" from SfxPoolItem - 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/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index a157f49cca09..6ebc9d27be5a 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -39,7 +39,7 @@ public: virtual ~SvxTwoLinesItem(); // "pure virtual Methods" from SfxPoolItem - 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 nVer) const; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 1d77351c7907..8b6499758ccd 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -57,11 +57,11 @@ public: // MS VC4.0 messes things up void SetValue( sal_uInt16 nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual int HasBoolValue() const; + virtual bool HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue( sal_Bool bVal ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) { diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 4faaa9c9cf79..46e4a31e1b13 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -47,7 +47,7 @@ public: inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - 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/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 548e232e0545..c4dc9ac26a58 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -55,7 +55,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 HasBoolValue() const; + virtual bool HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue( sal_Bool bVal ); diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 565a599d5e12..78c3f8e6852d 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -40,7 +40,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 7d4c11713aa8..5d026942695b 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -40,7 +40,7 @@ public: SvXMLAttrContainerItem( const SvXMLAttrContainerItem& ); virtual ~SvXMLAttrContainerItem(); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; using SfxPoolItem::Compare; virtual int Compare( const SfxPoolItem &rWith ) const; 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 ); }; 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; diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index e7f25623b990..33ce019115e5 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -45,7 +45,7 @@ public: ~XWindowItem(); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual int operator == ( const SfxPoolItem& rAttr ) const; + virtual bool operator == ( const SfxPoolItem& rAttr ) const; Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index a9f3eacdc4fc..b5480b0ac827 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -39,7 +39,7 @@ public: AffineMatrixItem(const AffineMatrixItem&); virtual ~AffineMatrixItem(); - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index aea4883bca0a..6ba81ac464b6 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -64,7 +64,7 @@ public: const OUString& rRangeText ); // "pure virtual Methoden" vom SfxPoolItem - 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) const; // leer virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 83af82dce4d1..58caee409342 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -90,7 +90,7 @@ public: SfxMapUnit ePresMetric, 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& rStream, sal_uInt16 nVer ) const; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 95e8c3a4871b..54c4ab0a5a4e 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -317,7 +317,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0) const; - virtual int operator == (const SfxPoolItem&) const; + virtual bool operator == (const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 362915f5444d..3407b5e83290 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxClipboardFmtItem : public SfxPoolItem SvxClipboardFmtItem_Impl* pImpl; protected: - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; public: diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 23df7cd6b810..a1b07f8f6eee 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -45,7 +45,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); @@ -75,7 +75,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); @@ -105,7 +105,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); @@ -136,7 +136,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); @@ -167,7 +167,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); @@ -195,7 +195,7 @@ public: SfxMapUnit ePresMetric, 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 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 ); diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 544411de514e..fae604d3ef36 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -40,7 +40,7 @@ public: SvxB3DVectorItem( const SvxB3DVectorItem& ); ~SvxB3DVectorItem(); - 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 nVersion) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index 2411cab6acc4..9509c8759aee 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -60,7 +60,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > GetGraphic() const { return m_xGraphic; } // pure virtual methods from SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // bridge to UNO virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index ec7afbbe2f29..f8c118637166 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -36,7 +36,7 @@ public: TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; }; // ------------------------------- diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index b40a41943029..cf1a6f7e3422 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -37,7 +37,7 @@ public: virtual ~SvxGrfCrop(); // "pure virtual methods" from SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index cbded4108507..11e6c4a032bb 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -64,7 +64,7 @@ public: inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem ); - 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/svx/numinf.hxx b/include/svx/numinf.hxx index 345384a16179..8154f0063ed1 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -49,7 +49,7 @@ public: SvxNumberInfoItem( const SvxNumberInfoItem& ); ~SvxNumberInfoItem(); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 3a76a8d7437d..385e125a3c80 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -34,7 +34,7 @@ public: OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); OfaPtrItem( const OfaPtrItem& ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; void* GetValue() const { return pPtr; } @@ -55,7 +55,7 @@ public: OfaRefItem( const OfaRefItem& rItem ) : SfxPoolItem( rItem.Which() ), mxRef( rItem.mxRef ) {} - virtual int operator==( const SfxPoolItem& rItem ) const + virtual bool operator==( const SfxPoolItem& rItem ) const { return mxRef == ((OfaRefItem<reference_type> &)rItem).mxRef; } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 8a358bdbd975..135abfd28f65 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -83,7 +83,7 @@ public: SvxGridItem( const SvxGridItem& pTestItem ); 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, diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index e3c9ae461401..2062347bb815 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -73,7 +73,7 @@ public: SvxPageItem( const SvxPageItem& rItem ); 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, diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 91785c9b891d..db32d35be00f 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem protected: - 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 ); @@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem protected: - 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 ); @@ -98,7 +98,7 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lWidth; long lHeight; protected: - 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 ); @@ -159,7 +159,7 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem sal_uInt8 bOrtho; // evenly spread columns protected: - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual OUString GetValueText() const; @@ -217,7 +217,7 @@ private: sal_Bool bLimits; /* boundary limit control by the application */ protected: - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index eb9413cff4be..88f606b59ce4 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -48,7 +48,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); SVX_DLLPUBLIC ~SdrCustomShapeAdjustmentItem(); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 460d57d58e30..ce48d3697c02 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -78,7 +78,7 @@ private: SdrCustomShapeGeometryItem( SvStream& rIn, sal_uInt16 nVersion ); ~SdrCustomShapeGeometryItem(); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index b5f8bc73fb98..89a74d57ec61 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -57,7 +57,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; - virtual int HasBoolValue() const; + virtual bool HasBoolValue() const; virtual sal_Bool GetBoolValue() const; virtual void SetBoolValue(sal_Bool bVal); }; diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index 8581ff890adb..1c0690ff5059 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -36,7 +36,7 @@ public: SvxGraphicItem( const SvxGraphicItem& ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; Graphic GetGraphic() const { return aGraphic; } diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 5c83c01771a2..e6557648ee87 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -33,7 +33,7 @@ public: SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const; diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 437ebf1329a1..883a8aace267 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -40,7 +40,7 @@ public: bool IsBookMode() const {return mbBookMode; } // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 700fc4414348..bbfcf7b08219 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -49,7 +49,7 @@ public: XFillBitmapItem( const XFillBitmapItem& rItem ); XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); - virtual int operator==( const SfxPoolItem& rItem ) const; + virtual bool operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 13e4c8f89b38..0ed9e49bdfe8 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -47,7 +47,7 @@ public: XColorItem(sal_uInt16 nWhich, SvStream& rIn); XColorItem(const XColorItem& rItem); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 907b8ad4eb78..8db65315aa10 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -41,7 +41,7 @@ public: XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True ); XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); - virtual int operator==( const SfxPoolItem& rItem ) const; + virtual bool operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 93b58313f327..592e11033549 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -43,7 +43,7 @@ public: XFillGradientItem(const XFillGradientItem& rItem); XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index b46bb30fdaa7..6b5115daf43c 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -41,7 +41,7 @@ public: XFillHatchItem(const XFillHatchItem& rItem); XFillHatchItem(SvStream& rIn); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 545603ca431b..e314154f67eb 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -52,7 +52,7 @@ public: NameOrIndex(const NameOrIndex& rNameOrIndex); ~NameOrIndex() {}; - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 537fea55af4b..bf4c63ced38c 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -42,7 +42,7 @@ public: XLineDashItem(const XLineDashItem& rItem); XLineDashItem(SvStream& rIn); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 61ca4c2c2e9e..e5e3ff1b22fd 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -41,7 +41,7 @@ public: XLineEndItem(const XLineEndItem& rItem); XLineEndItem(SvStream& rIn); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index c49f5c6c326d..e784ff5380da 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -41,7 +41,7 @@ public: XLineStartItem(const XLineStartItem& rItem); XLineStartItem(SvStream& rIn); - virtual int operator==(const SfxPoolItem& rItem) const; + virtual bool operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 91b80d51f20b..ff881917bc4b 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -45,7 +45,7 @@ public: sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer |