summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parent02f72c32cf5e33e28d2b2d63d887c8a429ec2a45 (diff)
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too. Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/ccoll.hxx2
-rw-r--r--sw/inc/cellatr.hxx6
-rw-r--r--sw/inc/fchrfmt.hxx2
-rw-r--r--sw/inc/fmtanchr.hxx2
-rw-r--r--sw/inc/fmtautofmt.hxx2
-rw-r--r--sw/inc/fmtclds.hxx2
-rw-r--r--sw/inc/fmtcnct.hxx2
-rw-r--r--sw/inc/fmtcntnt.hxx2
-rw-r--r--sw/inc/fmtflcnt.hxx2
-rw-r--r--sw/inc/fmtfld.hxx2
-rw-r--r--sw/inc/fmtfsize.hxx2
-rw-r--r--sw/inc/fmtftn.hxx2
-rw-r--r--sw/inc/fmtftntx.hxx2
-rw-r--r--sw/inc/fmthdft.hxx4
-rw-r--r--sw/inc/fmtinfmt.hxx2
-rw-r--r--sw/inc/fmtline.hxx2
-rw-r--r--sw/inc/fmtmeta.hxx2
-rw-r--r--sw/inc/fmtornt.hxx4
-rw-r--r--sw/inc/fmtpdsc.hxx2
-rw-r--r--sw/inc/fmtrfmrk.hxx2
-rw-r--r--sw/inc/fmtruby.hxx2
-rw-r--r--sw/inc/fmtsrnd.hxx2
-rw-r--r--sw/inc/fmturl.hxx2
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx2
-rw-r--r--sw/inc/grfatr.hxx6
-rw-r--r--sw/inc/hints.hxx2
-rw-r--r--sw/inc/paratr.hxx4
-rw-r--r--sw/inc/tgrditem.hxx2
-rw-r--r--sw/inc/tox.hxx2
-rw-r--r--sw/source/core/attr/cellatr.cxx6
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx2
-rw-r--r--sw/source/core/attr/hints.cxx2
-rw-r--r--sw/source/core/graphic/grfatr.cxx6
-rw-r--r--sw/source/core/layout/atrfrm.cxx30
-rw-r--r--sw/source/core/para/paratr.cxx4
-rw-r--r--sw/source/core/tox/tox.cxx2
-rw-r--r--sw/source/core/txtnode/atrfld.cxx2
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx2
-rw-r--r--sw/source/core/txtnode/atrftn.cxx2
-rw-r--r--sw/source/core/txtnode/atrref.cxx2
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx10
-rw-r--r--sw/source/filter/inc/fltshell.hxx10
-rw-r--r--sw/source/filter/ww1/fltshell.cxx10
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx2
-rw-r--r--sw/source/ui/config/cfgitems.cxx10
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx2
-rw-r--r--sw/source/ui/envelp/envimg.cxx2
-rw-r--r--sw/source/ui/envelp/labimg.cxx2
-rw-r--r--sw/source/ui/inc/cfgitems.hxx10
-rw-r--r--sw/source/ui/inc/envimg.hxx2
-rw-r--r--sw/source/ui/inc/labimg.hxx2
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx8
-rw-r--r--sw/source/ui/utlui/uiitems.cxx8
54 files changed, 106 insertions, 106 deletions
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;