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 /sc | |
parent | 02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff) |
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/attrib.hxx | 16 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 2 | ||||
-rw-r--r-- | sc/inc/docoptio.hxx | 2 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/patattr.hxx | 2 | ||||
-rw-r--r-- | sc/inc/printopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/viewopti.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/attrib.cxx | 16 | ||||
-rw-r--r-- | sc/source/core/data/patattr.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/defaultsoptions.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/docoptio.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/printopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/viewopti.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/uiitems.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/inc/uiitems.hxx | 18 |
16 files changed, 46 insertions, 46 deletions
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; } |