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 | |
| parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) | |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
262 files changed, 444 insertions, 447 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index b57abfecb9ce..f8e0f434e7f0 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -114,7 +114,7 @@ MediaItem::~MediaItem() // ------------------------------------------------------------------------------ -int MediaItem::operator==( const SfxPoolItem& rItem ) const +bool MediaItem::operator==( const SfxPoolItem& rItem ) const { assert( SfxPoolItem::operator==(rItem)); MediaItem const& rOther(static_cast< const MediaItem& >(rItem)); diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx index 75ff877b192f..7a1f2e935874 100644 --- a/basctl/source/basicide/sbxitem.cxx +++ b/basctl/source/basicide/sbxitem.cxx @@ -57,7 +57,7 @@ SfxPoolItem *SbxItem::Clone(SfxItemPool*) const return new SbxItem(*this); } -int SbxItem::operator==(const SfxPoolItem& rCmp) const +bool SbxItem::operator==(const SfxPoolItem& rCmp) const { SbxItem const* pSbxItem = dynamic_cast<SbxItem const*>(&rCmp); DBG_ASSERT(pSbxItem, "==: no SbxItem!" ); diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index 1d4b224c2cf2..c3c02cc2b64e 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -49,7 +49,7 @@ public: SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType); virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const; - virtual int operator==(const SfxPoolItem&) const; + virtual bool operator==(const SfxPoolItem&) const; ScriptDocument const& GetDocument () const { return m_aDocument; } OUString const& GetLibName () const { return m_aLibName; } diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index 48631df3a6d7..5a6894126cce 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -59,7 +59,7 @@ TextAttrib* SpellErrorAttrib::Clone() const } //----------------------------------------------------------------------- -int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const +bool SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; @@ -97,7 +97,7 @@ TextAttrib* SpellLanguageAttrib::Clone() const } //----------------------------------------------------------------------- -int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const +bool SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; @@ -135,7 +135,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const } //----------------------------------------------------------------------- -int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const +bool SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor; diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 72910c0135fd..0e945e4cde4e 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -114,7 +114,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; //------------------------------------------------- @@ -137,7 +137,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; //------------------------------------------------- @@ -159,7 +159,7 @@ public: virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; + virtual bool operator==( const TextAttrib& rAttr ) const; }; }//namespace svx #endif diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 2fdd1e463d7a..5a3606468014 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -290,7 +290,7 @@ SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const return new SvxChartColorTableItem( *this ); } -int SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" ); diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index c72948f2ac6f..b656d95b4b3c 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -98,7 +98,7 @@ public: SvxChartColorTableItem( const SvxChartColorTableItem& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SvxChartOptions* pOpts ) const; const SvxChartColorTable & GetColorList() const ; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 12e1b16d0a37..12d8fadffdd1 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -63,7 +63,7 @@ namespace offapp } //-------------------------------------------------------------------- - int DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const + bool DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const { const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare); if (!pItem) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 3a40015c9ff1..f1ddfbb51bf9 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -87,7 +87,7 @@ namespace offapp DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const DriverPoolingSettings& getSettings() const { return m_aSettings; } diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 9cfd86bcc3a4..a3f993ed5011 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -38,7 +38,7 @@ namespace svx } //-------------------------------------------------------------------- - int DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const + bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const { const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare); if ( !pItem ) diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 68063d960fc3..f3a0fb33f415 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -76,7 +76,7 @@ namespace svx DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const DatabaseRegistrations& diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6919c735f5c1..b8b06cdc0e8e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1114,7 +1114,7 @@ DbuTypeCollectionItem::DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSour { } -int DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const +bool DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const { DbuTypeCollectionItem* pCompare = PTR_CAST(DbuTypeCollectionItem, &_rItem); return pCompare && (pCompare->getCollection() == getCollection()); diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 0f425cd0898d..e1df6b7a6d72 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -40,7 +40,7 @@ namespace dbaui DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; + virtual bool operator==(const SfxPoolItem& _rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 301896d5e57a..f00a2951b0ff 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -36,7 +36,7 @@ namespace dbaui { } - int OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const + bool OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const { const OptionalBoolItem* pCompare = PTR_CAST( OptionalBoolItem, &_rItem ); if ( !pCompare ) diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index d341da2f1954..bebe97a6f1b0 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -37,7 +37,7 @@ namespace dbaui OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual int operator==( const SfxPoolItem& _rItem ) const; + virtual bool operator==( const SfxPoolItem& _rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; bool HasValue() const { return !!m_aValue; } diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 47bd22169e76..4c8459b7e2d0 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -40,7 +40,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); OPropertySetItem(const OPropertySetItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; + virtual bool operator==(const SfxPoolItem& _rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index f8edbc8ae67a..229185e7033a 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -40,7 +40,7 @@ public: OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; + virtual bool operator==(const SfxPoolItem& _rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; ::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; } diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 81b33cd31611..85a769ced14c 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -44,7 +44,7 @@ namespace dbaui { } - int OPropertySetItem::operator==(const SfxPoolItem& _rItem) const + bool OPropertySetItem::operator==(const SfxPoolItem& _rItem) const { const OPropertySetItem* pCompare = PTR_CAST(OPropertySetItem, &_rItem); if ((!pCompare) || (pCompare->m_xSet.get() != m_xSet.get())) diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 0fc33526ed49..a794011be26a 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -38,7 +38,7 @@ OStringListItem::OStringListItem(const OStringListItem& _rSource) { } -int OStringListItem::operator==(const SfxPoolItem& _rItem) const +bool OStringListItem::operator==(const SfxPoolItem& _rItem) const { const OStringListItem* pCompare = PTR_CAST(OStringListItem, &_rItem); if ((!pCompare) || (pCompare->m_aList.getLength() != m_aList.getLength())) diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index da40d02b7a31..1c681c4342a0 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -268,7 +268,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) // ----------------------------------------------------------------------- -int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const +bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT(rItem.ISA(SvxBulletItem),"operator==Types not matching"); const SvxBulletItem& rBullet = (const SvxBulletItem&)rItem; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 11c079b542c5..5f661c6e9945 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -352,7 +352,7 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co // ----------------------------------------------------------------------- -int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const +bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index b48f8d3cb053..6b8c60a5d2d4 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -312,7 +312,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) : // ----------------------------------------------------------------------- -int SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -558,7 +558,7 @@ void SvxLRSpaceItem::AdjustLeft() // ----------------------------------------------------------------------- -int SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -925,7 +925,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // ----------------------------------------------------------------------- -int SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1168,7 +1168,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation // class SvxProtectItem -------------------------------------------------- -int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1398,7 +1398,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // ----------------------------------------------------------------------- -int SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1655,7 +1655,7 @@ inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 // ----------------------------------------------------------------------- -int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -2528,7 +2528,7 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) // ----------------------------------------------------------------------- -int SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const { SvxBoxInfoItem& rBoxInfo = (SvxBoxInfoItem&)rAttr; @@ -2914,7 +2914,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // class SvxFmtBreakItem ------------------------------------------------- -int SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" ); @@ -3140,7 +3140,7 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine ) // ----------------------------------------------------------------------- -int SvxLineItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -3844,7 +3844,7 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem ) // ----------------------------------------------------------------------- -int SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -4166,7 +4166,7 @@ SvxFrameDirectionItem::~SvxFrameDirectionItem() { } -int SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const +bool SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const { DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" ); diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 08f0a63cd7b6..719970fa6082 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -961,7 +961,7 @@ SvxNumBulletItem::~SvxNumBulletItem() delete pNumRule; } -int SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const +bool SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const { return *pNumRule == *((SvxNumBulletItem&)rCopy).pNumRule; } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 53f92281686f..3cb1f4ce7882 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -92,7 +92,7 @@ SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const // ----------------------------------------------------------------------- -int SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const +bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" ); return ( xSpellCheck == ( (const SfxSpellCheckItem& )rItem ).GetXSpellChecker() ); @@ -120,7 +120,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : // ----------------------------------------------------------------------- -int SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const +bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 747664150799..1207f36a2478 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -94,7 +94,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId // ----------------------------------------------------------------------- -int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -355,7 +355,7 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) // ----------------------------------------------------------------------- -int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -726,7 +726,7 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // ----------------------------------------------------------------------- -int SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1077,7 +1077,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } // ----------------------------------------------------------------------- -int SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1608,7 +1608,7 @@ bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal, return sal_False; } -int SvxParaVertAlignItem::operator==( const SfxPoolItem& rItem ) const +bool SvxParaVertAlignItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return SfxUInt16Item::operator==( rItem ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 7352f575e1f3..9b2d207b8c39 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -183,7 +183,7 @@ SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const // ----------------------------------------------------------------------- -int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -341,7 +341,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) // ----------------------------------------------------------------------- -int SvxFontItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -593,7 +593,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } // ----------------------------------------------------------------------- -int SvxPostureItem::HasBoolValue() const +bool SvxPostureItem::HasBoolValue() const { return sal_True; } @@ -623,7 +623,7 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) : // ----------------------------------------------------------------------- -int SvxWeightItem::HasBoolValue() const +bool SvxWeightItem::HasBoolValue() const { return sal_True; } @@ -812,7 +812,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, // ----------------------------------------------------------------------- -int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const +bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return GetHeight() == ((SvxFontHeightItem&)rItem).GetHeight() && @@ -1193,7 +1193,7 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, // ----------------------------------------------------------------------- -int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const +bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return GetWidth() == ((SvxFontWidthItem&)rItem).GetWidth() && @@ -1278,7 +1278,7 @@ SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId // ----------------------------------------------------------------------- -int SvxTextLineItem::HasBoolValue() const +bool SvxTextLineItem::HasBoolValue() const { return sal_True; } @@ -1426,7 +1426,7 @@ bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -int SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const +bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return SfxEnumItem::operator==( rItem ) && @@ -1508,7 +1508,7 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 // ----------------------------------------------------------------------- -int SvxCrossedOutItem::HasBoolValue() const +bool SvxCrossedOutItem::HasBoolValue() const { return sal_True; } @@ -1966,7 +1966,7 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const // ----------------------------------------------------------------------- -int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -2354,7 +2354,7 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc, // ----------------------------------------------------------------------- -int SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -2992,7 +2992,7 @@ SvxTwoLinesItem::~SvxTwoLinesItem() { } -int SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attribute types" ); return bOn == ((SvxTwoLinesItem&)rAttr).bOn && @@ -3235,7 +3235,7 @@ bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal, return bRet; } -int SvxCharRotateItem::operator==( const SfxPoolItem& rItem ) const +bool SvxCharRotateItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return SfxUInt16Item::operator==( rItem ) && diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 3cca42722668..1a715bed52e8 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -36,7 +36,7 @@ SvxWritingModeItem::~SvxWritingModeItem() { } -int SvxWritingModeItem::operator==( const SfxPoolItem& rCmp ) const +bool SvxWritingModeItem::operator==( const SfxPoolItem& rCmp ) const { DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" ); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 8cd6de2fa38e..32b6b369847c 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -49,7 +49,7 @@ SvXMLAttrContainerItem::~SvXMLAttrContainerItem() delete pImpl; } -int SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const +bool SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( rItem.ISA(SvXMLAttrContainerItem), "SvXMLAttrContainerItem::operator ==(): Bad type"); 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 diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 1aa4d64e846e..6ed3d5815039 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -58,7 +58,7 @@ public: virtual OUString GetValueText() 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; @@ -118,7 +118,7 @@ public: OUString& rText, const IntlWrapper* pIntl = 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; @@ -163,7 +163,7 @@ public: inline ScRangeItem& operator=( const ScRangeItem &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, @@ -218,7 +218,7 @@ public: ScTableListItem& operator=( const ScTableListItem &rCpy ); // "pure virtual Methoden" from SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -254,7 +254,7 @@ public: ~ScPageHFItem(); virtual OUString GetValueText() 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; @@ -308,7 +308,7 @@ public: ~ScDoubleItem(); virtual OUString GetValueText() 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; @@ -340,7 +340,7 @@ public: virtual ScPageScaleToItem* Clone( SfxItemPool* = 0 ) const; - virtual int operator==( const SfxPoolItem& rCmp ) const; + virtual bool operator==( const SfxPoolItem& rCmp ) const; inline sal_uInt16 GetWidth() const { return mnWidth; } inline sal_uInt16 GetHeight() const { return mnHeight; } @@ -376,7 +376,7 @@ public: virtual ~ScCondFormatItem(); - virtual int operator==(const SfxPoolItem& rCmp ) const; + virtual bool operator==(const SfxPoolItem& rCmp ) const; virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const; const std::vector<sal_uInt32>& GetCondFormatData() const; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index a9c37db9c0af..6c52db9f950d 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -52,7 +52,7 @@ public: ~ScTpDefaultsItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; } diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index a90b70be38c2..a1b39d820ae8 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -152,7 +152,7 @@ public: ~ScTpCalcItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScDocOptions& GetDocOptions() const { return theOptions; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index cce5549390d2..cd9597c73f39 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -88,7 +88,7 @@ public: ~ScTpFormulaItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScFormulaOptions& GetFormulaOptions() const { return theOptions; } diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index cf09d54f5168..c66342857f9e 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -65,7 +65,7 @@ public: virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const; - virtual int operator==(const SfxPoolItem& rCmp) const; + virtual bool operator==(const SfxPoolItem& rCmp) const; const SfxPoolItem& GetItem( sal_uInt16 nWhichP ) const { return GetItemSet().Get(nWhichP); } diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 83710bd0ea7e..99e96a623154 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -62,7 +62,7 @@ public: ~ScTpPrintItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScPrintOptions& GetPrintOptions() const { return theOptions; } diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index c5db568529f1..0c7cfd656ac0 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -121,7 +121,7 @@ public: ~ScTpViewItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScViewOptions& GetViewOptions() const { return theOptions; } diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 71d9caee6778..5b864344863a 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -137,7 +137,7 @@ OUString ScMergeAttr::GetValueText() const //------------------------------------------------------------------------ -int ScMergeAttr::operator==( const SfxPoolItem& rItem ) const +bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); return (Which() == rItem.Which()) @@ -376,7 +376,7 @@ SfxItemPresentation ScProtectionAttr::GetPresentation //------------------------------------------------------------------------ -int ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const +bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); return (Which() == rItem.Which()) @@ -446,7 +446,7 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) // ScRangeItem - Tabellenbereich // ----------------------------------------------------------------------- -int ScRangeItem::operator==( const SfxPoolItem& rAttr ) const +bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -544,7 +544,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) // ----------------------------------------------------------------------- -int ScTableListItem::operator==( const SfxPoolItem& rAttr ) const +bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -724,7 +724,7 @@ OUString ScPageHFItem::GetValueText() const //------------------------------------------------------------------------ -int ScPageHFItem::operator==( const SfxPoolItem& rItem ) const +bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -1074,7 +1074,7 @@ OUString ScDoubleItem::GetValueText() const //------------------------------------------------------------------------ -int ScDoubleItem::operator==( const SfxPoolItem& rItem ) const +bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); const ScDoubleItem& _rItem = (const ScDoubleItem&)rItem; @@ -1132,7 +1132,7 @@ ScPageScaleToItem* ScPageScaleToItem::Clone( SfxItemPool* ) const return new ScPageScaleToItem( *this ); } -int ScPageScaleToItem::operator==( const SfxPoolItem& rCmp ) const +bool ScPageScaleToItem::operator==( const SfxPoolItem& rCmp ) const { OSL_ENSURE( SfxPoolItem::operator==( rCmp ), "ScPageScaleToItem::operator== - unequal wid or type" ); const ScPageScaleToItem& rPageCmp = static_cast< const ScPageScaleToItem& >( rCmp ); @@ -1234,7 +1234,7 @@ ScCondFormatItem::~ScCondFormatItem() { } -int ScCondFormatItem::operator==( const SfxPoolItem& rCmp ) const +bool ScCondFormatItem::operator==( const SfxPoolItem& rCmp ) const { return maIndex == static_cast<const ScCondFormatItem&>(rCmp).maIndex; } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index c8c0b4ecc335..e570895a3fff 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -140,7 +140,7 @@ inline bool EqualPatternSets( const SfxItemSet& rSet1, const SfxItemSet& rSet2 ) return ( 0 == memcmp( pItems1, pItems2, (ATTR_PATTERN_END - ATTR_PATTERN_START + 1) * sizeof(pItems1[0]) ) ); } -int ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const +bool ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const { // #i62090# Use quick comparison between ScPatternAttr's ItemSets diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 896a94a672ff..8047122fc25f 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -81,7 +81,7 @@ OUString ScTpDefaultsItem::GetValueText() const return OUString("ScTpDefaultsItem"); } -int ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const +bool ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index ca3bbd93b8ac..c3676a569c0b 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -121,7 +121,7 @@ OUString ScTpCalcItem::GetValueText() const return OUString("ScTpCalcItem"); } -int ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const +bool ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index e954423886e4..12b9cec04d36 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -172,7 +172,7 @@ OUString ScTpFormulaItem::GetValueText() const return OUString("ScTpFormulaItem"); } -int ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const +bool ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index be1da7e93e49..13eb0bbc01d5 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -92,7 +92,7 @@ OUString ScTpPrintItem::GetValueText() const return OUString("ScTpPrintItem"); } -int ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const +bool ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 5d3877ebbfbc..18ecb3488646 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -215,7 +215,7 @@ OUString ScTpViewItem::GetValueText() const return OUString("ScTpViewItem"); } -int ScTpViewItem::operator==( const SfxPoolItem& rItem ) const +bool ScTpViewItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index ab83063d74e0..00d08577f4c6 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -79,7 +79,7 @@ OUString ScInputStatusItem::GetValueText() const return OUString("InputStatus"); } -int ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const +bool ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -199,7 +199,7 @@ OUString ScSortItem::GetValueText() const //------------------------------------------------------------------------ -int ScSortItem::operator==( const SfxPoolItem& rItem ) const +bool ScSortItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -306,7 +306,7 @@ OUString ScQueryItem::GetValueText() const //------------------------------------------------------------------------ -int ScQueryItem::operator==( const SfxPoolItem& rItem ) const +bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -370,7 +370,7 @@ OUString ScSubTotalItem::GetValueText() const //------------------------------------------------------------------------ -int ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const +bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -431,7 +431,7 @@ OUString ScUserListItem::GetValueText() const //------------------------------------------------------------------------ -int ScUserListItem::operator==( const SfxPoolItem& rItem ) const +bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -497,7 +497,7 @@ OUString ScConsolidateItem::GetValueText() const //------------------------------------------------------------------------ -int ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const +bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -558,7 +558,7 @@ OUString ScPivotItem::GetValueText() const //------------------------------------------------------------------------ -int ScPivotItem::operator==( const SfxPoolItem& rItem ) const +bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -611,7 +611,7 @@ OUString ScSolveItem::GetValueText() const //------------------------------------------------------------------------ -int ScSolveItem::operator==( const SfxPoolItem& rItem ) const +bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -661,7 +661,7 @@ OUString ScTabOpItem::GetValueText() const //------------------------------------------------------------------------ -int ScTabOpItem::operator==( const SfxPoolItem& rItem ) const +bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index a74a08d4ddd5..7265742789bc 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -67,7 +67,7 @@ public: virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScAddress& GetPos() const { return aCursorPos; } @@ -162,7 +162,7 @@ public: ~ScSortItem(); virtual OUString GetValueText() 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 nMemberUd ) const; @@ -189,7 +189,7 @@ public: ~ScQueryItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; ScViewData* GetViewData () const { return pViewData; } @@ -220,7 +220,7 @@ public: ~ScSubTotalItem(); virtual OUString GetValueText() 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 nMemberUd ) const; @@ -243,7 +243,7 @@ public: ~ScUserListItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; void SetUserList ( const ScUserList& rUserList ); @@ -265,7 +265,7 @@ public: ~ScConsolidateItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScConsolidateParam& GetData() const { return theConsData; } @@ -286,7 +286,7 @@ public: ~ScPivotItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScDPSaveData& GetData() const { return *pSaveData; } @@ -311,7 +311,7 @@ public: ~ScSolveItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScSolveParam& GetData() const { return theSolveData; } @@ -332,7 +332,7 @@ public: ~ScTabOpItem(); virtual OUString GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; const ScTabOpParam& GetData() const { return theTabOpData; } diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index dac516b94bf6..e7ea9b696ce6 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -157,7 +157,7 @@ public: DiaTimeItem( sal_uInt32 nValue = 0L ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; }; #endif // INCLUDED_SD_INC_SDATTR_HXX diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index f337dd68ffdb..01dbe043dcfd 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -133,7 +133,7 @@ SfxPoolItem* DiaTimeItem::Clone( SfxItemPool* ) const } -int DiaTimeItem::operator==( const SfxPoolItem& rItem ) const +bool DiaTimeItem::operator==( const SfxPoolItem& rItem ) const { return( ( (DiaTimeItem&) rItem ).GetValue() == GetValue() ); } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index e96058820e17..9435add8da1d 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -347,7 +347,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==( rAttr ); DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different pool item type!" ); @@ -450,7 +450,7 @@ SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), different pool item type!" ); @@ -779,7 +779,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), different pool item type!" ); @@ -981,7 +981,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), different pool item type!" ); @@ -1511,7 +1511,7 @@ SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const // ---------------------------------------------------------------------- -int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const +bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const { const bool bSameType = SfxPoolItem::operator==(rAttr); DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), different pool item type!" ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 05db6abaa6a1..d300734ea3ad 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -163,7 +163,7 @@ public: SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -196,7 +196,7 @@ public: SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -345,7 +345,7 @@ public: SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -414,7 +414,7 @@ public: SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; @@ -587,7 +587,7 @@ public: SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; void SetOptions( SdOptions* pOpts ) const; diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 5bfa6ff3ff54..b582a7f91642 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -35,7 +35,7 @@ public: virtual ~SfxScriptOrganizerItem(); 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 ); OUString getLanguage() { return aLanguage; }; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index ce60d875cee6..6b5c3e710fe2 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -74,7 +74,7 @@ void SfxEventNamesList::DelDtor() aEventNamesList.clear(); } -int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const +bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 1da819d1c243..02e782fb381c 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -59,7 +59,7 @@ SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): // op == -int SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const +bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && pBasicManager == ((const SfxMacroInfoItem&)rCmp).pBasicManager && diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index fefc88794c27..2114ffaf1551 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -59,7 +59,7 @@ SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const //------------------------------------------------------------------------ -int SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const +bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const { return rItem.Type() == Type() && SfxStringItem::operator==(rItem) && diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 6b58a5181614..0cb897792517 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -327,7 +327,7 @@ SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const } //------------------------------------------------------------------------ -int SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const +bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const { if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem))) return false; diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 716b234d28ae..f34844c1ef18 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -57,7 +57,7 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : // op == -int SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const +bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const { return ( SfxFlagItem::operator==( rCmp ) && aStyle == ( (const SfxTemplateItem&)rCmp ).aStyle ); diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 2d1a9f4cf368..7a8cba85891b 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -186,7 +186,7 @@ TYPEINIT1(SfxFrameDescriptorItem, SfxPoolItem); SfxFrameDescriptorItem::~SfxFrameDescriptorItem() {} -int SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const +bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 981afdea5b04..c48fce0663a6 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -29,7 +29,7 @@ TYPEINIT1_AUTOFACTORY(SfxObjectItem,SfxPoolItem) //========================================================================= -int SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const +bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const { return PTR_CAST(SfxObjectShellItem, &rItem)->pObjSh == pObjSh; } @@ -107,7 +107,7 @@ SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh ) //-------------------------------------------------------------------- -int SfxObjectItem::operator==( const SfxPoolItem &rItem ) const +bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const { SfxObjectItem *pOther = PTR_CAST(SfxObjectItem, &rItem); return pOther->_pSh == _pSh; diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index c3614a2087de..fea32c12cdc5 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -94,7 +94,7 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con // ----------------------------------------------------------------------- -int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index f64b7b6b4614..fa51f5438332 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -549,7 +549,7 @@ SfxFrameItem::SfxFrameItem( SfxFrame *p ): { } -int SfxFrameItem::operator==( const SfxPoolItem &rItem ) const +bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const { return ((SfxFrameItem&)rItem).pFrame == pFrame && ((SfxFrameItem&)rItem).wFrame == wFrame; @@ -609,7 +609,7 @@ SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const ::com::sun::star::uno:: aValue = rAny; } -int SfxUsrAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const +bool SfxUsrAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const { return sal_False; } @@ -643,7 +643,7 @@ SfxUnoFrameItem::SfxUnoFrameItem( sal_uInt16 nWhichId, const ::com::sun::star::u { } -int SfxUnoFrameItem::operator==( const SfxPoolItem& i_rItem ) const +bool SfxUnoFrameItem::operator==( const SfxPoolItem& i_rItem ) const { return i_rItem.ISA( SfxUnoFrameItem ) && static_cast< const SfxUnoFrameItem& >( i_rItem ).m_xFrame == m_xFrame; } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index c95686919f3a..8206d6c094d4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1621,7 +1621,7 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... //======================================================================== -int SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const +bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const { return PTR_CAST(SfxViewFrameItem, &rItem)->pFrame== pFrame; } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 1fb59d5363ee..341697aa2478 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -34,7 +34,7 @@ DBG_NAME(SfxEnumItemInterface) TYPEINIT1(SfxEnumItemInterface, SfxPoolItem) // virtual -int SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const +bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const { SFX_ASSERT(SfxPoolItem::operator ==(rItem), Which(), "unequal type"); return GetEnumValue() @@ -103,7 +103,7 @@ sal_Bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const } // virtual -int SfxEnumItemInterface::HasBoolValue() const +bool SfxEnumItemInterface::HasBoolValue() const { return false; } @@ -175,7 +175,7 @@ SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream) } // virtual -int SfxBoolItem::operator ==(const SfxPoolItem & rItem) const +bool SfxBoolItem::operator ==(const SfxPoolItem & rItem) const { DBG_ASSERT(rItem.ISA(SfxBoolItem), "SfxBoolItem::operator ==(): Bad type"); diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 5cdf1fb45c2e..779e60a4726e 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -30,7 +30,7 @@ DBG_NAME(CntByteItem) TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem); // virtual -int CntByteItem::operator ==(const SfxPoolItem & rItem) const +bool CntByteItem::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(CntByteItem, 0); DBG_ASSERT(rItem.ISA(CntByteItem), @@ -146,7 +146,7 @@ CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) : } // virtual -int CntUInt16Item::operator ==(const SfxPoolItem & rItem) const +bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(CntUInt16Item, 0); DBG_ASSERT(rItem.ISA(CntUInt16Item), @@ -264,7 +264,7 @@ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : } // virtual -int CntInt32Item::operator ==(const SfxPoolItem & rItem) const +bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(CntInt32Item, 0); DBG_ASSERT(rItem.ISA(CntInt32Item), @@ -381,7 +381,7 @@ CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) : } // virtual -int CntUInt32Item::operator ==(const SfxPoolItem & rItem) const +bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(CntUInt32Item, 0); DBG_ASSERT(rItem.ISA(CntUInt32Item), diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index b0e0e82db244..731394df8a42 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -89,18 +89,15 @@ CntWallpaperItem::~CntWallpaperItem() } // ----------------------------------------------------------------------- -int CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const +bool CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); const CntWallpaperItem& rWallItem = (const CntWallpaperItem&)rItem; - if( ( rWallItem._nStyle == _nStyle ) && + return ( rWallItem._nStyle == _nStyle ) && ( rWallItem._nColor == _nColor ) && - ( rWallItem._aURL == _aURL ) ) - return sal_True; - else - return sal_False; + ( rWallItem._aURL == _aURL ); } // virtual diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 19164d99b17a..48509dbf9fb7 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -93,7 +93,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const } // virtual -int CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const +bool CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const { const CntContentTypeItem& rOther = (const CntContentTypeItem&)rOrig; diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index ebbba99427ac..04ed1b59117a 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -32,7 +32,7 @@ DBG_NAME(CntUnencodedStringItem) TYPEINIT1_AUTOFACTORY(CntUnencodedStringItem, SfxPoolItem) // virtual -int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const +bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(CntUnencodedStringItem, 0); DBG_ASSERT(rItem.ISA(CntUnencodedStringItem), diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 1e5253aeeebe..a730c5ce7445 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -104,7 +104,7 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const // ----------------------------------------------------------------------- -int SfxFlagItem::operator==( const SfxPoolItem& rItem ) const +bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const { DBG_CHKTHIS(SfxFlagItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 6dbe174c4878..50000b7c7750 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -56,7 +56,7 @@ SfxGlobalNameItem::~SfxGlobalNameItem() // ----------------------------------------------------------------------- -int SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const +bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const { return ((SfxGlobalNameItem&)rItem).m_aName == m_aName; } diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index 1c6072055e2a..d9415abd2c72 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -52,7 +52,7 @@ const std::map<OUString, uno::Any>& SfxGrabBagItem::GetGrabBag() const return m_aMap; } -int SfxGrabBagItem::operator==(const SfxPoolItem& rItem) const +bool SfxGrabBagItem::operator==(const SfxPoolItem& rItem) const { SfxGrabBagItem* pItem = (SfxGrabBagItem*)&rItem; diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index e9b94fdba65d..53d4bb730449 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -56,7 +56,7 @@ SfxIntegerListItem::~SfxIntegerListItem() { } -int SfxIntegerListItem::operator==( const SfxPoolItem& rPoolItem ) const +bool SfxIntegerListItem::operator==( const SfxPoolItem& rPoolItem ) const { if ( !rPoolItem.ISA( SfxIntegerListItem ) ) return sal_False; diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index deb5a7368a84..99487fa2d8da 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -28,7 +28,7 @@ struct SfxImageItem_Impl OUString aURL; long nAngle; bool bMirrored; - int operator == ( const SfxImageItem_Impl& rOther ) const + bool operator == ( const SfxImageItem_Impl& rOther ) const { return nAngle == rOther.nAngle && bMirrored == rOther.bMirrored; } }; @@ -59,7 +59,7 @@ SfxPoolItem* SfxImageItem::Clone( SfxItemPool* ) const } -int SfxImageItem::operator==( const SfxPoolItem& rItem ) const +bool SfxImageItem::operator==( const SfxPoolItem& rItem ) const { return( ((SfxImageItem&) rItem).GetValue() == GetValue() && (*pImp == *(((SfxImageItem&)rItem).pImp) ) ); } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index bd4e4af7bf1f..37d4df9b6881 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -56,7 +56,7 @@ SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream): } // virtual -int SfxInt16Item::operator ==(const SfxPoolItem & rItem) const +bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(SfxInt16Item, 0); DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 1563c375f9f8..b2655095936c 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -60,7 +60,7 @@ SfxLockBytesItem::~SfxLockBytesItem() // ----------------------------------------------------------------------- -int SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const +bool SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const { return ((SfxLockBytesItem&)rItem)._xVal == _xVal; } diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index a84ca7afa7b3..d1d4b5147471 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -192,7 +192,7 @@ sal_Bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent) // ----------------------------------------------------------------------- -int SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 3147c5c5e84d..530b8dfb2c3b 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -148,7 +148,7 @@ int SfxPoolItem::Compare( const SfxPoolItem& rWith, const IntlWrapper& ) const } // ------------------------------------------------------------------------ -int SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const +bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const { DBG_CHKTHIS(SfxPoolItem, 0); return rCmp.Type() == Type(); @@ -274,7 +274,7 @@ SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy): } // ------------------------------------------------------------------------ -int SfxVoidItem::operator==( const SfxPoolItem& +bool SfxVoidItem::operator==( const SfxPoolItem& #ifdef DBG_UTIL rCmp #endif @@ -282,7 +282,7 @@ rCmp { DBG_CHKTHIS(SfxVoidItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); - return sal_True; + return true; } // ------------------------------------------------------------------------ diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 956a20330b39..52d2688f81da 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -81,7 +81,7 @@ SfxItemPresentation SfxPointItem::GetPresentation // ----------------------------------------------------------------------- -int SfxPointItem::operator==( const SfxPoolItem& rItem ) const +bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const { DBG_CHKTHIS(SfxPointItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index dcd5974056a0..a1e0e6206f7c 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -81,7 +81,7 @@ SfxItemPresentation SfxRectangleItem::GetPresentation // ----------------------------------------------------------------------- -int SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const +bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const { DBG_CHKTHIS(SfxRectangleItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 0fd983300d47..db2bc0c86cd1 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -77,7 +77,7 @@ SfxItemPresentation SfxRangeItem::GetPresentation // ----------------------------------------------------------------------- -int SfxRangeItem::operator==( const SfxPoolItem& rItem ) const +bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); SfxRangeItem* pT = (SfxRangeItem*)&rItem; @@ -146,7 +146,7 @@ SfxUShortRangesItem::~SfxUShortRangesItem() } -int SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const +bool SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const { const SfxUShortRangesItem &rOther = (const SfxUShortRangesItem&) rItem; if ( !_pRanges && !rOther._pRanges ) diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 28e16926f37f..bdb1128217b1 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -64,7 +64,7 @@ SfxSetItem::~SfxSetItem() // -------------------------------------------------------------------------- -int SfxSetItem::operator==( const SfxPoolItem& rCmp) const +bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const { DBG_CHKTHIS(SfxSetItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 7b6e9a094329..01a8768ce241 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -133,7 +133,7 @@ const std::vector<OUString>& SfxStringListItem::GetList () const } -int SfxStringListItem::operator==( const SfxPoolItem& rItem ) const +bool SfxStringListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 78b91d373f32..3db3d80c5845 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -238,7 +238,7 @@ static bool operator == ( const SearchOptions& rItem1, const SearchOptions& rIte } -int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const +bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); const SvxSearchItem &rSItem = (SvxSearchItem &) rItem; diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 78f1ada2059e..5fb184d510d5 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -77,7 +77,7 @@ SfxItemPresentation SfxSizeItem::GetPresentation // ----------------------------------------------------------------------- -int SfxSizeItem::operator==( const SfxPoolItem& rItem ) const +bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const { DBG_CHKTHIS(SfxSizeItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index bcfceffdaa0d..4bf43b3bb9e2 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -39,7 +39,7 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream): } // virtual -int SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const +bool SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(SfxVisibilityItem, 0); DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index 25b4f3ff25b3..ed81d04dead2 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -54,7 +54,7 @@ SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const } -int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const +bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 95350c2373b5..36e792e01f03 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -85,7 +85,7 @@ SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const return new SvxGridItem( *this ); } -int SvxGridItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "different types "); diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 3e5d873f9c5e..2abb3c5981c0 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -31,7 +31,7 @@ TYPEINIT1(SvxObjectItem, SfxPoolItem); /* SvxLongLRSpaceItem */ -int SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const +bool SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && mlLeft == ((const SvxLongLRSpaceItem &)rCmp).mlLeft && @@ -176,7 +176,7 @@ void SvxLongLRSpaceItem::SetRight(long lArgRight) /* SvxLongULSpaceItem */ -int SvxLongULSpaceItem::operator==( const SfxPoolItem& rCmp) const +bool SvxLongULSpaceItem::operator==( const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && mlLeft == ((const SvxLongULSpaceItem&)rCmp).mlLeft && @@ -317,7 +317,7 @@ void SvxLongULSpaceItem::SetLower(long lArgRight) /* SvxPagePosSizeItem */ -int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const +bool SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && aPos == ((const SvxPagePosSizeItem &)rCmp).aPos && @@ -435,7 +435,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() : /* SvxColumnItem */ -int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const +bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const { if(!SfxPoolItem::operator==(rCmp) || nActColumn != ((const SvxColumnItem&)rCmp).nActColumn || @@ -742,7 +742,7 @@ sal_Bool SvxColumnItem::IsConsistent() const return nActColumn < aColumns.size(); } -int SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const +bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const { return SfxPoolItem::operator==(rCmp) && nStartX == ((const SvxObjectItem&)rCmp).nStartX && diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index 4fa37b1d343f..f845495a93b6 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -29,7 +29,7 @@ SvxGraphicItem::SvxGraphicItem( const SvxGraphicItem& rItem) { } -int SvxGraphicItem::operator==( const SfxPoolItem& rItem) const +bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const { return ((SvxGraphicItem&)rItem).aGraphic == aGraphic; } diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index ed99a105c7d8..6759276e582a 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -28,7 +28,7 @@ TYPEINIT1(FmInterfaceItem, SfxPoolItem); //------------------------------------------------------------------------------ -int FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const +bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); return( xInterface == ((FmInterfaceItem&)rAttr).GetInterface() ); diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 98ffc9c6fd96..d01e1e1dad75 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -39,7 +39,7 @@ public: inline FmInterfaceItem& operator=( const FmInterfaceItem &rCpy ); // "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; diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 57c6588e6d70..3fd891d7fad3 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -66,7 +66,7 @@ bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId // ----------------------------------------------------------------------- -int SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 790190f5458f..ede9f6eab76e 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -288,7 +288,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation //------------------------------------------------------------------------ -int SvxMarginItem::operator==( const SfxPoolItem& rItem ) const +bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index d0b38ee773d8..5ec07a2463d9 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -264,7 +264,7 @@ SfxItemPresentation SvxDoubleItem::GetPresentation // ----------------------------------------------------------------------- -int SvxDoubleItem::operator == (const SfxPoolItem& rItem) const +bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return (((SvxDoubleItem&)rItem).fVal == fVal); } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index af6236d72645..47537c0a4232 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -92,7 +92,7 @@ bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_ return false; } -int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const +bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const { const SvxClipboardFmtItem& rCmp = (SvxClipboardFmtItem&)rComp; if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size()) diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index e47724d7e6e9..ab67dd275267 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -231,7 +231,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( SvStream& /*rIn*/, sal_u } } -int SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const +bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const { int bRet = SfxPoolItem::operator==( rCmp ); if ( bRet ) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 0f497cf601d1..a89cca42ebcf 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -66,7 +66,7 @@ SfxItemPresentation SvxColorListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -int SvxColorListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxColorListItem& ) rItem).pColorList == pColorList; @@ -136,7 +136,7 @@ SfxItemPresentation SvxGradientListItem::GetPresentation } -int SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxGradientListItem& ) rItem).pGradientList == pGradientList; @@ -190,7 +190,7 @@ SfxItemPresentation SvxHatchListItem::GetPresentation } -int SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxHatchListItem& ) rItem).pHatchList == pHatchList; @@ -239,7 +239,7 @@ SfxItemPresentation SvxBitmapListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -int SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxBitmapListItem& ) rItem).pBitmapList == pBitmapList; @@ -287,7 +287,7 @@ SfxItemPresentation SvxDashListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -int SvxDashListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxDashListItem& ) rItem).pDashList == pDashList; @@ -334,7 +334,7 @@ SfxItemPresentation SvxLineEndListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -int SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const +bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); return ( ( SvxLineEndListItem& ) rItem).pLineEndList == pLineEndList; diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 40be011d7033..517e9e41589b 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -66,7 +66,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : // ----------------------------------------------------------------------- -int SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const +bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { DBG_CHKTHIS(SvxB3DVectorItem, 0); DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index c07ed06c17dc..b626e1a9eaf1 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -126,7 +126,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId return true; } -int SvxGalleryItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxGalleryItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index fa8b5778133c..b83cab7c95de 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -47,7 +47,7 @@ SvxGrfCrop::~SvxGrfCrop() { } -int SvxGrfCrop::operator==( const SfxPoolItem& rAttr ) const +bool SvxGrfCrop::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attributes" ); return nLeft == ((const SvxGrfCrop&)rAttr).GetLeft() && diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 65e6bb467af0..5af2eb821526 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -229,7 +229,7 @@ SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const return new SvxHyperlinkItem( *this ); } -int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 3ad62a7350a3..ef2969f1f47a 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -131,7 +131,7 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation // ----------------------------------------------------------------------- -int SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const +bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index f64a97104beb..6b33715e77b1 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -30,7 +30,7 @@ OfaPtrItem::OfaPtrItem( const OfaPtrItem& rItem) { } -int OfaPtrItem::operator==( const SfxPoolItem& rItem) const +bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const { return ((OfaPtrItem&)rItem).pPtr == pPtr; } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index a431a9fea121..cdebc8ae20b4 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -73,7 +73,7 @@ SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const Beschreibung: Abfrage auf Gleichheit --------------------------------------------------------------------*/ -int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); const SvxPageItem& rItem = (SvxPageItem&)rAttr; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index c45635eb137c..5d6ec82ecfda 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -81,7 +81,7 @@ SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // ----------------------------------------------------------------------- -int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index eb04b54c04e0..23b47f6fd5df 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -78,7 +78,7 @@ SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // ----------------------------------------------------------------------- -int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const +bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 8f701a3b15e0..45984d1f8110 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -654,7 +654,7 @@ SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): nValue=Fraction(nMul,nDiv); } -int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const +bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const { return SfxPoolItem::operator==(rCmp) && ((SdrFractionItem&)rCmp).GetValue()==nValue; @@ -1077,7 +1077,7 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio return ePres; } -int SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } +bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } @@ -1473,7 +1473,7 @@ SdrCustomShapeAdjustmentItem::~SdrCustomShapeAdjustmentItem() { } -int SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const +bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const { int bRet = SfxPoolItem::operator==( rCmp ); if ( bRet ) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 600774b3cee7..200c8a3d5c91 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -77,7 +77,7 @@ SfxPoolItem* TbxImageItem::Clone( SfxItemPool* ) const return new TbxImageItem( *this ); } -int TbxImageItem::operator==( const SfxPoolItem& rItem ) const +bool TbxImageItem::operator==( const SfxPoolItem& rItem ) const { return( ( (TbxImageItem&) rItem ).GetValue() == GetValue() ); } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 9cc0f5dc5415..4bbb8008c9ce 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -104,7 +104,7 @@ NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) : { } -int NameOrIndex::operator==(const SfxPoolItem& rItem) const +bool NameOrIndex::operator==(const SfxPoolItem& rItem) const { return ( SfxStringItem::operator==(rItem) && ((const NameOrIndex&) rItem).nPalIndex == nPalIndex ); @@ -303,7 +303,7 @@ SfxPoolItem* XColorItem::Clone(SfxItemPool* /*pPool*/) const return new XColorItem(*this); } -int XColorItem::operator==(const SfxPoolItem& rItem) const +bool XColorItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && ((const XColorItem&) rItem).aColor == aColor ); @@ -703,7 +703,7 @@ SfxPoolItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const return new XLineDashItem(*this); } -int XLineDashItem::operator==(const SfxPoolItem& rItem) const +bool XLineDashItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && aDash == ((const XLineDashItem&) rItem).aDash ); @@ -1313,7 +1313,7 @@ SfxPoolItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const return new XLineStartItem(*this); } -int XLineStartItem::operator==(const SfxPoolItem& rItem) const +bool XLineStartItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && ((const XLineStartItem&) rItem).maPolyPolygon == maPolyPolygon ); } @@ -1671,7 +1671,7 @@ SfxPoolItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const return new XLineEndItem(*this); } -int XLineEndItem::operator==(const SfxPoolItem& rItem) const +bool XLineEndItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && ((const XLineEndItem&) rItem).maPolyPolygon == maPolyPolygon ); } @@ -2609,7 +2609,7 @@ SfxPoolItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const return new XFillGradientItem(*this); } -int XFillGradientItem::operator==(const SfxPoolItem& rItem) const +bool XFillGradientItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && aGradient == ((const XFillGradientItem&) rItem).aGradient ); @@ -2961,7 +2961,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, c SetWhich( XATTR_FILLFLOATTRANSPARENCE ); } -int XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const +bool XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const { return ( NameOrIndex::operator==(rItem) ) && ( GetGradientValue() == ((const XFillGradientItem&)rItem).GetGradientValue() ) && @@ -3110,7 +3110,7 @@ SfxPoolItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const return new XFillHatchItem(*this); } -int XFillHatchItem::operator==(const SfxPoolItem& rItem) const +bool XFillHatchItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && aHatch == ((const XFillHatchItem&) rItem).aHatch ); diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 7c20c0001aeb..8a644acbe168 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -236,7 +236,7 @@ AffineMatrixItem::~AffineMatrixItem() { } -int AffineMatrixItem::operator==(const SfxPoolItem& rRef) const +bool AffineMatrixItem::operator==(const SfxPoolItem& rRef) const { if(!SfxPoolItem::operator==(rRef)) { diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index f8c53d795217..04e8c8c7f490 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -347,7 +347,7 @@ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const return new XFillBitmapItem(*this); } -int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const +bool XFillBitmapItem::operator==(const SfxPoolItem& rItem) const { return (NameOrIndex::operator==(rItem) && maGraphicObject == ((const XFillBitmapItem&)rItem).maGraphicObject); diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index bcf05bdbe3b9..8889873e9400 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -67,7 +67,7 @@ public: TYPEINFO(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; static const CommandStruct* GetCmds(); diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 31eecf5c290d..9407a9475486 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -36,7 +36,7 @@ public: sal_Bool bAuto = sal_False ); // "pure virtual methods" of SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr ) @@ -60,7 +60,7 @@ public: ~SwTblBoxFormula() {}; // "pure virtual methods" of SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -85,7 +85,7 @@ public: SwTblBoxValue( const double aVal ); // "pure virtual methods" of SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp ) diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 0a99f079613c..ac3a264c2c0f 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -56,7 +56,7 @@ public: TYPEINFO(); /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index d048dce72d75..69954cb9e241 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -52,7 +52,7 @@ public: SwFmtAnchor &operator=( const SwFmtAnchor& ); /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index dd6bf3b2e8c1..9a88dadcc557 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -47,7 +47,7 @@ public: TYPEINFO(); /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 3fe065ca1c3c..e20aee540dfc 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -101,7 +101,7 @@ public: SwFmtCol& operator=( const SwFmtCol& ); /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index c0dd7c0458d4..e626a0523fd6 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -42,7 +42,7 @@ public: inline SwFmtChain &operator=( const SwFmtChain& ); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 57c020086ade..333f9eed8a04 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -40,7 +40,7 @@ public: ~SwFmtCntnt(); /// "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; const SwNodeIndex *GetCntntIdx() const { return pStartNode; } diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 2bd7b9358a8a..48039542e67b 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -37,7 +37,7 @@ class SwFmtFlyCnt : public SfxPoolItem public: SwFmtFlyCnt( SwFrmFmt *pFrmFmt ); /// "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; inline SwFrmFmt *GetFrmFmt() const { return pFmt; } diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 47826637cb24..b545328fe072 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -66,7 +66,7 @@ public: virtual ~SwFmtFld(); /// "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual bool GetInfo( SfxPoolItem& rInfo ) const; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 02d3be616cde..699d3b28ddbd 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -65,7 +65,7 @@ public: SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy ); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index ab290e3ac332..1e8e1487d216 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -45,7 +45,7 @@ public: virtual ~SwFmtFtn(); /// "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; OUString GetNumStr() const { return m_aNumber; } diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 4132cab0f5a8..6b3d8a6036a4 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -55,7 +55,7 @@ protected: public: virtual sal_uInt16 GetValueCount() 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/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 4a58c1fe4cdc..bf0be326afe5 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -45,7 +45,7 @@ public: TYPEINFO(); /// "pure virtual methods" of SfxPoolItem - 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, @@ -78,7 +78,7 @@ public: TYPEINFO(); /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 21797515bdbb..3d433cce0dd1 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -51,7 +51,7 @@ public: TYPEINFO(); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index dc0e67ffbddb..64a6ea8d589e 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -39,7 +39,7 @@ public: TYPEINFO(); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 5405f2e22ee2..c6a186125a7b 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -109,7 +109,7 @@ public: virtual ~SwFmtMeta(); /// SfxPoolItem - virtual int operator==( const SfxPoolItem & ) const; + virtual bool operator==( const SfxPoolItem & ) const; virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const; /// notify clients registered at m_pMeta that this meta is being (re-)moved diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 72e71fefe35c..1c8584abe243 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -43,7 +43,7 @@ public: inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - 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, @@ -79,7 +79,7 @@ public: inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index e6647bcbfa2d..28b96f5f7980 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -59,7 +59,7 @@ public: TYPEINFO(); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index caa03a62047d..f7c41095d078 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -41,7 +41,7 @@ public: ~SwFmtRefMark( ); /// "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; } diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index a9010f2e3ed7..e70ac456494c 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -43,7 +43,7 @@ public: SwFmtRuby& operator=( const SwFmtRuby& rAttr ); // "Pure virtual methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 104dc3fd67ea..a79a5a9a908d 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -39,7 +39,7 @@ public: inline SwFmtSurround &operator=( const SwFmtSurround &rCpy ); // "Pure virtual Methods" of SfxPoolItem. - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index f846fcc84766..c73a05606153 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -49,7 +49,7 @@ public: virtual ~SwFmtURL(); /// "Pure virtual methods" of SfxPoolItem. - 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/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 557efd6c7437..e4d7b2607230 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -44,7 +44,7 @@ public: const SwFmtWrapInfluenceOnObjPos& _rSource ); /// pure virtual methods of class <SfxPoolItem> - virtual int operator==( const SfxPoolItem& _rAttr ) const; + virtual bool operator==( const SfxPoolItem& _rAttr ) 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/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 9b440269d557..3898d7629ef4 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -60,7 +60,7 @@ public: // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const; - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -113,7 +113,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -221,7 +221,7 @@ public: // pure virtual methods from SfxEnumItem 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, diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index f3f1dcbcaef1..5f3ffc009197 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -40,7 +40,7 @@ public: SwMsgPoolItem( sal_uInt16 nWhich ); // "Overhead" of SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; }; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index ef640040ab0d..1f035a9ddb0f 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -64,7 +64,7 @@ protected: public: /// "pure virtual methods" of SfxPoolItem - 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, @@ -146,7 +146,7 @@ public: { SetValue( rCpy.GetValue() ); return *this; } /// "pure virtual methods" of SfxPoolItem - 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/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 1e7b8a371102..c137fcda1bcc 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -48,7 +48,7 @@ public: virtual ~SwTextGridItem(); // "pure virtual methods" of SfxPoolItem - 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/sw/inc/tox.hxx b/sw/inc/tox.hxx index 7ffcfaee2243..42727553d0a0 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -88,7 +88,7 @@ public: SwTOXMark& operator=( const SwTOXMark& rCopy ); // "pure virtual methods" of SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; void InvalidateTOXMark(); 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; |