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 /cui | |
parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 6 | ||||
-rw-r--r-- | cui/source/options/cfgchart.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/cfgchart.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/connpoolsettings.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/connpoolsettings.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/dbregistersettings.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/dbregistersettings.hxx | 2 |
8 files changed, 12 insertions, 12 deletions
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& |