summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
parent02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff)
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too. Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sorgitm.hxx2
-rw-r--r--sfx2/source/config/evntconf.cxx2
-rw-r--r--sfx2/source/control/minfitem.cxx2
-rw-r--r--sfx2/source/control/sorgitm.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/dialog/tplpitem.cxx2
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/objitem.cxx4
-rw-r--r--sfx2/source/doc/zoomitem.cxx2
-rw-r--r--sfx2/source/view/frame.cxx6
-rw-r--r--sfx2/source/view/viewfrm.cxx2
11 files changed, 14 insertions, 14 deletions
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;
}