summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-10 17:01:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-10 17:11:51 +0100
commitd1043892df97078546bf9c5ac697bcb65b457cc9 (patch)
tree0219c41b945daaf4ce8e4b6c40b2c2b33a4c9536 /editeng
parent02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff)
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too. Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/bulitem.cxx2
-rw-r--r--editeng/source/items/flditem.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx22
-rw-r--r--editeng/source/items/numitem.cxx2
-rw-r--r--editeng/source/items/optitems.cxx4
-rw-r--r--editeng/source/items/paraitem.cxx10
-rw-r--r--editeng/source/items/textitem.cxx26
-rw-r--r--editeng/source/items/writingmodeitem.cxx2
-rw-r--r--editeng/source/items/xmlcnitm.cxx2
9 files changed, 36 insertions, 36 deletions
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");