bool improvements

Change-Id: Ic6488ac278cac2d1d7e240abff545f9ea0b8eafe

10 files changed, 31 insertions, 30 deletions

diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 9e2e26503b0b..c336a532b4a1 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -285,7 +285,7 @@ void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
     rCntPos = pPrevNode->Len();
 }
 
-int EditRTFParser::IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const
+bool EditRTFParser::IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const
 {
     return ( nCnt == ( ((EditNodeIdx*)pNd)->GetNode()->Len()) );
 }
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index ac8ccf279e1f..206a2622da14 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -86,7 +86,7 @@ protected:
     virtual void        UnknownAttrToken( int nToken, SfxItemSet* pSet );
     virtual void        NextToken( int nToken );
     virtual void        SetAttrInDoc( SvxRTFItemStackType &rSet );
-    virtual int         IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const;
+    virtual bool        IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const;
     virtual void        CalcValue();
     void                CreateStyleSheets();
     SfxStyleSheet*      CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 31deb7606b77..b5168f6f6944 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -893,7 +893,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         case EE_CHAR_OUTLINE:
         {
             rOutput << OOO_STRING_SVTOOLS_RTF_OUTL;
-            if ( ((const SvxContourItem&)rItem).GetValue() == 0 )
+            if ( !((const SvxContourItem&)rItem).GetValue() )
                 rOutput << '0';
         }
         break;
@@ -920,7 +920,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         case EE_CHAR_SHADOW:
         {
             rOutput << OOO_STRING_SVTOOLS_RTF_SHAD;
-            if ( ((const SvxShadowedItem&)rItem).GetValue() == 0 )
+            if ( !((const SvxShadowedItem&)rItem).GetValue() )
                 rOutput << '0';
         }
         break;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 5f661c6e9945..96de48e1be4a 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -244,7 +244,7 @@ SvxFieldData* SvxFieldData::Clone() const
 
 // -----------------------------------------------------------------------
 
-int SvxFieldData::operator==( const SvxFieldData& rFld ) const
+bool SvxFieldData::operator==( const SvxFieldData& rFld ) const
 {
     DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" );
     (void)rFld;
@@ -400,7 +400,7 @@ SvxFieldData* SvxDateField::Clone() const
 
 // -----------------------------------------------------------------------
 
-int SvxDateField::operator==( const SvxFieldData& rOther ) const
+bool SvxDateField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
         return sal_False;
@@ -538,7 +538,7 @@ SvxFieldData* SvxURLField::Clone() const
 
 // -----------------------------------------------------------------------
 
-int SvxURLField::operator==( const SvxFieldData& rOther ) const
+bool SvxURLField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
         return sal_False;
@@ -620,7 +620,7 @@ SvxFieldData* SvxPageField::Clone() const
     return new SvxPageField;        // empty
 }
 
-int SvxPageField::operator==( const SvxFieldData& rCmp ) const
+bool SvxPageField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxPageField) );
 }
@@ -648,7 +648,7 @@ SvxFieldData* SvxPagesField::Clone() const
     return new SvxPagesField;   // empty
 }
 
-int SvxPagesField::operator==( const SvxFieldData& rCmp ) const
+bool SvxPagesField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxPagesField) );
 }
@@ -670,7 +670,7 @@ SvxFieldData* SvxTimeField::Clone() const
     return new SvxTimeField;    // empty
 }
 
-int SvxTimeField::operator==( const SvxFieldData& rCmp ) const
+bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxTimeField) );
 }
@@ -697,7 +697,7 @@ SvxFieldData* SvxFileField::Clone() const
     return new SvxFileField;    // empty
 }
 
-int SvxFileField::operator==( const SvxFieldData& rCmp ) const
+bool SvxFileField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxFileField) );
 }
@@ -731,7 +731,7 @@ SvxFieldData* SvxTableField::Clone() const
     return new SvxTableField(mnTab);
 }
 
-int SvxTableField::operator==( const SvxFieldData& rCmp ) const
+bool SvxTableField::operator==( const SvxFieldData& rCmp ) const
 {
     if (rCmp.Type() != TYPE(SvxTableField))
         return false;
@@ -780,7 +780,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
 
 //----------------------------------------------------------------------------
 
-int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
+bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
         return sal_False;
@@ -924,7 +924,7 @@ SvxFieldData* SvxExtFileField::Clone() const
 
 //----------------------------------------------------------------------------
 
-int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
+bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
         return sal_False;
@@ -1076,7 +1076,7 @@ SvxFieldData* SvxAuthorField::Clone() const
 
 //----------------------------------------------------------------------------
 
-int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
+bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
         return sal_False;
@@ -1176,7 +1176,7 @@ SvxFieldData* SvxHeaderField::Clone() const
     return new SvxHeaderField;      // empty
 }
 
-int SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
+bool SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxHeaderField) );
 }
@@ -1199,7 +1199,7 @@ SvxFieldData* SvxFooterField::Clone() const
     return new SvxFooterField;      // empty
 }
 
-int SvxFooterField::operator==( const SvxFieldData& rCmp ) const
+bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxFooterField) );
 }
@@ -1221,7 +1221,7 @@ SvxFieldData* SvxDateTimeField::Clone() const
     return new SvxDateTimeField;        // empty
 }
 
-int SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
+bool SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
 {
     return ( rCmp.Type() == TYPE(SvxDateTimeField) );
 }
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 4ec1280ce5f9..82753f2f0b4a 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -31,7 +31,7 @@ SvxFieldData* SdrMeasureField::Clone() const
     return new SdrMeasureField(*this);
 }
 
-int SdrMeasureField::operator==(const SvxFieldData& rSrc) const
+bool SdrMeasureField::operator==(const SvxFieldData& rSrc) const
 {
     return eMeasureFieldKind==((SdrMeasureField&)rSrc).GetMeasureFieldKind();
 }
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 9b2d207b8c39..7089b026b364 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -347,7 +347,7 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
 
     const SvxFontItem& rItem = (const SvxFontItem&)rAttr;
 
-    int bRet = ( eFamily == rItem.eFamily &&
+    bool bRet = ( eFamily == rItem.eFamily &&
                  aFamilyName == rItem.aFamilyName &&
                  aStyleName == rItem.aStyleName );
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 83a470710727..a961b2ee0992 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -94,19 +94,19 @@ TYPEINIT0(SvxAutoCorrect)
 
 typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr;
 
-static inline int IsWordDelim( const sal_Unicode c )
+static inline bool IsWordDelim( const sal_Unicode c )
 {
     return ' ' == c || '\t' == c || 0x0a == c ||
             cNonBreakingSpace == c || 0x2011 == c || 0x1 == c;
 }
 
-static inline int IsLowerLetter( sal_Int32 nCharType )
+static inline bool IsLowerLetter( sal_Int32 nCharType )
 {
     return CharClass::isLetterType( nCharType ) &&
             0 == ( ::com::sun::star::i18n::KCharacterType::UPPER & nCharType);
 }
 
-static inline int IsUpperLetter( sal_Int32 nCharType )
+static inline bool IsUpperLetter( sal_Int32 nCharType )
 {
     return CharClass::isLetterType( nCharType ) &&
             0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 79c2ae7f25e7..c67e8d8496dc 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -287,7 +287,7 @@ void SvxBoundArgs::NoteRange( bool bToggle )
             aBoolArr.erase( aBoolArr.begin() + nMaxIdx, aBoolArr.begin() + (nMaxIdx + nDiff) );
         }
         DBG_ASSERT( nMaxIdx < aBoolArr.size(), "NoteRange: Too much deleted" );
-        aBoolArr[ nMaxIdx ] = aBoolArr[ nMaxIdx ] ^ bToggle;
+        aBoolArr[ nMaxIdx ] = aBoolArr[ nMaxIdx ] != bToggle;
     }
 }
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 6675edba5380..023a12f5d20d 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -217,7 +217,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
     RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
     sal_uInt16 nFontAlign;
 
-    int bChkStkPos = !bNewGroup && !aAttrStack.empty();
+    bool bChkStkPos = !bNewGroup && !aAttrStack.empty();
 
     while( bContinue && IsParserWorking() )  // as long as known Attribute are recognized
     {
@@ -1403,7 +1403,8 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
         aAttr = *(SvxBoxItem*)pItem;
 
     SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0 );  // Simple plain line
-    int bContinue = sal_True, nBorderTyp = 0;
+    bool bContinue = true;
+    int nBorderTyp = 0;
 
     long nWidth = 1;
     bool bDoubleWidth = false;
@@ -1585,7 +1586,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
                                         int bTableDef )
 {
     // then read the border attribute
-    int bContinue = sal_True;
+    bool bContinue = true;
     sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX;
     sal_uInt8 nFillValue = 0;
 
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 0331be70aa66..cdd6fe81b51e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -925,7 +925,7 @@ void SvxRTFParser::AttrGroupEnd()   // process the current, delete from Stack
             }
 
             // Set all attributes which have been defined from start until here
-            int bCrsrBack = !pInsPos->GetCntIdx();
+            bool bCrsrBack = !pInsPos->GetCntIdx();
             if( bCrsrBack )
             {
                 // at the beginning of a paragraph? Move back one position
@@ -1025,7 +1025,7 @@ void SvxRTFParser::AttrGroupEnd()   // process the current, delete from Stack
                     {
                         // at the beginning of a paragraph? Move back one position
                         MovePos( sal_True );
-                        bCrsrBack = sal_False;
+                        bCrsrBack = false;
 
                         // Open a new Group.
                         SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
@@ -1094,7 +1094,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
 }
 
     // Has no Text been inserted yet? (SttPos from the top Stack entry!)
-int SvxRTFParser::IsAttrSttPos()
+bool SvxRTFParser::IsAttrSttPos()
 {
     SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
     return !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&