sal_Bool to bool and minor optimizations

Change-Id: Iddee0b723ce8a0ac9020b0b048a31212dc377430

9 files changed, 72 insertions, 81 deletions

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 683d15456a01..a987acb4ec27 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -121,8 +121,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     /// Copies the attributes at nStart to pDest.
     SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
 
-    SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True,
-                                sal_Bool bChgFollow = sal_True );
+    SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, bool bNext = true,
+                                bool bChgFollow = true );
 
     SAL_DLLPRIVATE void CutImpl(
           SwTxtNode * const pDest, const SwIndex & rDestStart,
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     SAL_DLLPRIVATE void CalcHiddenCharFlags() const;
 
-    SAL_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const;
+    SAL_DLLPRIVATE SwNumRule * _GetNumRule(bool bInParent = true) const;
 
     SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
             LanguageType nLang, sal_uInt16 nLangWhichId,
@@ -269,7 +269,7 @@ public:
         const sal_Int32 nLen,
         const sal_uInt16 nWhich = 0,
         const SfxItemSet* pSet = 0,
-        const sal_Bool bInclRefToxMark = sal_False );
+        const bool bInclRefToxMark = false );
     void    GCAttr();
 
     // Delete text attribute (needs to be deregistered at Pool!)
@@ -289,19 +289,19 @@ public:
 
     /** Set these attributes at TextNode. If the whole range is comprised
        set them only in AutoAttrSet (SwCntntNode::SetAttr). */
-    sal_Bool SetAttr( const SfxItemSet& rSet,
+    bool SetAttr( const SfxItemSet& rSet,
                   sal_Int32 nStt, sal_Int32 nEnd,
                   const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT );
     /** Query the attributes of textnode over the range.
        Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
-       If <bMergeIndentValuesOfNumRule> == sal_True, the indent attributes of
+       If <bMergeIndentValuesOfNumRule> == true, the indent attributes of
        the corresponding list level of an applied list style is merged into
-       the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == sal_False,
+       the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == false,
        corresponding node has not its own indent attributes and the
        position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */
-    sal_Bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
-                  sal_Bool bOnlyTxtAttr  = sal_False,
-                  sal_Bool bGetFromChrFmt = sal_True,
+    bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
+                  const bool bOnlyTxtAttr  = false,
+                  const bool bGetFromChrFmt = true,
                   const bool bMergeIndentValuesOfNumRule = false ) const;
 
     /// Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray.
@@ -419,7 +419,7 @@ public:
 
        @return numbering rule of this text node or NULL if none is set
      */
-    SwNumRule *GetNumRule(sal_Bool bInParent = sal_True) const;
+    SwNumRule *GetNumRule(bool bInParent = true) const;
 
     inline const SwNodeNum* GetNum() const
     {
@@ -469,7 +469,7 @@ public:
 
        @return additional indents
      */
-     long GetLeftMarginWithNum( sal_Bool bTxtLeft = sal_False ) const;
+     long GetLeftMarginWithNum( bool bTxtLeft = false ) const;
 
     /**
        Returns the combined first line indent of this text node and
@@ -478,10 +478,10 @@ public:
        @param the first line indent of this text node taking the
                numbering into account (return parameter)
 
-       @retval sal_True   this node has SwNodeNum and has numbering rule
-       @retval sal_False  else
+       @retval true   this node has SwNodeNum and has numbering rule
+       @retval false  else
      */
-    sal_Bool GetFirstLineOfsWithNum( short& rFirstOffset ) const;
+    bool GetFirstLineOfsWithNum( short& rFirstOffset ) const;
 
     SwTwips GetAdditionalIndentForStartingNewList() const;
 
@@ -500,10 +500,10 @@ public:
         numbering rule and the numbering format specified for the
         level of the SwNodeNum is of an enumeration type.
 
-        @retval sal_True    This text node has a number.
-        @retval sal_False   else
+        @retval true    This text node has a number.
+        @retval false   else
      */
-    sal_Bool HasNumber() const;
+    bool HasNumber() const;
 
     /** Returns if this text node has a bullet.
 
@@ -511,23 +511,23 @@ public:
         numbering rule and the numbering format specified for the
         level of the SwNodeNum is of a bullet type.
 
-        @retval sal_True    This text node has a bullet.
-        @retval sal_False   else
+        @retval true    This text node has a bullet.
+        @retval false   else
      */
-    sal_Bool HasBullet() const;
+    bool HasBullet() const;
 
     /** Returns is this text node is numbered.
 
         This node is numbered if it has a SwNodeNum and it has a
         numbering rule and has not a hidden SwNodeNum.
 
-        ATTENTION: Returns sal_True even if the SwNumFmt has type
+        ATTENTION: Returns true even if the SwNumFmt has type
         SVX_NUM_NUMBER_NONE.
 
-        @retval sal_True      This node is numbered.
-        @retval sal_False     else
+        @retval true      This node is numbered.
+        @retval false     else
      */
-    sal_Bool IsNumbered() const;
+    bool IsNumbered() const;
 
     /** Returns if this text node has a marked label.
 
@@ -613,7 +613,7 @@ public:
        Note: This function returns false, if the numbering format is
        SVX_NUM_NUMBER_NONE or if the numbering/bullet has been deleted.
 
-       @return     sal_True if the paragraph has a visible numbering/bullet/outline
+       @return     true if the paragraph has a visible numbering/bullet/outline
      */
     bool HasVisibleNumberingOrBullet() const;
 
@@ -663,11 +663,11 @@ public:
                     sal_uInt16 nScript = 0 ) const;
 
     /// in ndcopy.cxx
-    sal_Bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
+    bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
 
     /// Interactive hyphenation: we find TxtFrm and call its CalcHyph.
-    sal_Bool Hyphenate( SwInterHyphInfo &rHyphInf );
+    bool Hyphenate( SwInterHyphInfo &rHyphInf );
     void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd );
 
     /** add 4th optional parameter <bAddSpaceAfterListLabelStr> indicating,
@@ -689,8 +689,8 @@ public:
 
     OUString GetRedlineTxt( sal_Int32 nIdx = 0,
                           sal_Int32 nLen = SAL_MAX_INT32,
-                          sal_Bool bExpandFlds = sal_False,
-                          sal_Bool bWithNum = sal_False ) const;
+                          bool bExpandFlds = false,
+                          bool bWithNum = false ) const;
 
     /** @return actual count of initial chars for initial-function.
        If nWishLen == 0 that of first word. */
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index b77657208e26..7f04523ebf08 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -140,7 +140,7 @@ sal_Bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                         : static_cast<SwTxtNode*>(pNd)->GetTxt().getLength();
 
                     ((SwTxtNode*)pNd)->GetAttr( *pSet, nStt, nEnd,
-                                                sal_False, sal_True,
+                                                false, true,
                                                 bMergeIndentValuesOfNumRule );
                 }
                 break;
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 8b15118bbe6a..6636666fa425 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1480,7 +1480,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 rRect.Top( rRect.Top() + nFirst );
             rRect.Height( nLineHeight );
             SwTwips nLeft = rFill.Left() + rLRSpace.GetLeft() +
-                            GetTxtNode()->GetLeftMarginWithNum( sal_False );
+                            GetTxtNode()->GetLeftMarginWithNum();
             SwTwips nRight = rFill.Right() - rLRSpace.GetRight();
             SwTwips nCenter = ( nLeft + nRight ) / 2;
             rRect.Left( nLeft );
@@ -1553,7 +1553,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 else if( rFill.X() > nLeft )
                 {
                     SwTwips nTxtLeft = rFill.Left() + rLRSpace.GetTxtLeft() +
-                                    GetTxtNode()->GetLeftMarginWithNum( sal_True );
+                                    GetTxtNode()->GetLeftMarginWithNum( true );
                     rFill.nLineWidth += rFill.bFirstLine ? nLeft : nTxtLeft;
                     SwTwips nLeftTab = nLeft;
                     SwTwips nRightTab = nLeft;
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 26341a4a910c..53e0d0ae8881 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -428,7 +428,7 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
     return bRet;
 }
 
-sal_Bool SwTxtNode::IsSymbol( const sal_Int32 nBegin ) const
+bool SwTxtNode::IsSymbol( const sal_Int32 nBegin ) const
 {
     SwScriptInfo aScriptInfo;
     SwAttrIter aIter( *(SwTxtNode*)this, aScriptInfo );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 69c3c254e07f..aa034720ac1f 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -192,14 +192,14 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
     // 5. paragraph border
     // Note: These values have already been used during calculation
     // of the printing area of the paragraph.
-    const int nLMWithNum = pNode->GetLeftMarginWithNum( sal_True );
+    const int nLMWithNum = pNode->GetLeftMarginWithNum( true );
     if ( pFrm->IsRightToLeft() )
     {
         // this calculation is identical this the calculation for L2R layout - see below
         nLeft = pFrm->Frm().Left() +
                 pFrm->Prt().Left() +
                 nLMWithNum -
-                pNode->GetLeftMarginWithNum( sal_False ) -
+                pNode->GetLeftMarginWithNum() -
                 // #i95907#
                 // #i111284#
 //                rSpace.GetLeft() +
@@ -219,7 +219,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
             nLeft = pFrm->Frm().Left() +
                     pFrm->Prt().Left() +
                     nLMWithNum -
-                    pNode->GetLeftMarginWithNum( sal_False ) -
+                    pNode->GetLeftMarginWithNum() -
                     // #i95907#
                     // #i111284#
                     ( bListLevelIndentsApplicableAndLabelAlignmentActive
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6ce20e8374c9..70dc04c0e6ab 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -362,7 +362,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
     const sal_Int32 nSplitPos = rPos.nContent.GetIndex();
     const sal_Int32 nTxtLen = m_Text.getLength();
     SwTxtNode* const pNode =
-        _MakeNewTxtNode( rPos.nNode, sal_False, nSplitPos==nTxtLen );
+        _MakeNewTxtNode( rPos.nNode, false, nSplitPos==nTxtLen );
 
     // the first paragraph gets the XmlId,
     // _except_ if it is empty and the second is not empty
@@ -2450,7 +2450,7 @@ void SwTxtNode::GCAttr()
 }
 
 // #i23726#
-SwNumRule* SwTxtNode::_GetNumRule(sal_Bool bInParent) const
+SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const
 {
     SwNumRule* pRet = 0;
 
@@ -2490,7 +2490,7 @@ SwNumRule* SwTxtNode::_GetNumRule(sal_Bool bInParent) const
     return pRet;
 }
 
-SwNumRule* SwTxtNode::GetNumRule(sal_Bool bInParent) const
+SwNumRule* SwTxtNode::GetNumRule(bool bInParent) const
 {
     return _GetNumRule(bInParent);
 }
@@ -2526,15 +2526,10 @@ void SwTxtNode::NumRuleChgd()
 }
 
 // -> #i27615#
-sal_Bool SwTxtNode::IsNumbered() const
+bool SwTxtNode::IsNumbered() const
 {
-    sal_Bool bResult = sal_False;
-
     SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
-    if ( pRule && IsCountedInList() )
-        bResult = sal_True;
-
-    return bResult;
+    return pRule && IsCountedInList();
 }
 
 bool SwTxtNode::HasMarkedLabel() const
@@ -2551,8 +2546,8 @@ bool SwTxtNode::HasMarkedLabel() const
 }
 // <- #i27615#
 
-SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext,
-                                        sal_Bool bChgFollow )
+SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
+                                       bool bChgFollow )
 {
     /* hartes PageBreak/PageDesc/ColumnBreak aus AUTO-Set ignorieren */
     SwAttrSet* pNewAttrSet = 0;
@@ -2681,7 +2676,7 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
 {
     // Position hinter dem eingefuegt wird
     SwNodeIndex aIdx( rPos.nNode, 1 );
-    SwTxtNode* pNew = _MakeNewTxtNode( aIdx, sal_True );
+    SwTxtNode* pNew = _MakeNewTxtNode( aIdx, true );
 
     // reset list attributes at appended text node
     pNew->ResetAttr( RES_PARATR_LIST_ISRESTART );
@@ -2732,9 +2727,9 @@ SwTxtAttr * SwTxtNode::GetTxtAttrForCharAt(
 }
 
 // -> #i29560#
-sal_Bool SwTxtNode::HasNumber() const
+bool SwTxtNode::HasNumber() const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule )
@@ -2757,9 +2752,9 @@ sal_Bool SwTxtNode::HasNumber() const
     return bResult;
 }
 
-sal_Bool SwTxtNode::HasBullet() const
+bool SwTxtNode::HasBullet() const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule )
@@ -2819,7 +2814,7 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
     return OUString();
 }
 
-long SwTxtNode::GetLeftMarginWithNum( sal_Bool bTxtLeft ) const
+long SwTxtNode::GetLeftMarginWithNum( bool bTxtLeft ) const
 {
     long nRet = 0;
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
@@ -2870,9 +2865,8 @@ long SwTxtNode::GetLeftMarginWithNum( sal_Bool bTxtLeft ) const
     return nRet;
 }
 
-sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
+bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
 {
-    sal_Bool bRet( sal_False );
     // #i95907#
     rFLOffset = 0;
 
@@ -2915,14 +2909,11 @@ sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
             }
         }
 
-        bRet = sal_True;
-    }
-    else
-    {
-        rFLOffset = GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst();
+        return true;
     }
 
-    return bRet;
+    rFLOffset = GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst();
+    return false;
 }
 
 //
@@ -3326,7 +3317,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
 }
 
 OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
-                                sal_Bool bExpandFlds, sal_Bool bWithNum ) const
+                                   bool bExpandFlds, bool bWithNum ) const
 {
     std::vector<sal_Int32> aRedlArr;
     const SwDoc* pDoc = GetDoc();
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 07fd4a32d009..aec3d2614627 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1859,14 +1859,14 @@ bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
 
 // setze diese Attribute am TextNode. Wird der gesamte Bereich umspannt,
 // dann setze sie nur im AutoAttrSet (SwCntntNode:: SetAttr)
-sal_Bool SwTxtNode::SetAttr(
+bool SwTxtNode::SetAttr(
     const SfxItemSet& rSet,
     const sal_Int32 nStt,
     const sal_Int32 nEnd,
     const SetAttrMode nMode )
 {
     if( !rSet.Count() )
-        return sal_False;
+        return false;
 
     // teil die Sets auf (fuer Selektion in Nodes)
     const SfxItemSet* pSet = &rSet;
@@ -1898,8 +1898,8 @@ sal_Bool SwTxtNode::SetAttr(
             // we want to set them at the paragraph:
             if( aTxtSet.Count() != rSet.Count() )
             {
-                sal_Bool bRet = SetAttr( rSet );
-                  if( !aTxtSet.Count() )
+                const bool bRet = SetAttr( rSet );
+                if( !aTxtSet.Count() )
                     return bRet;
             }
 
@@ -1909,8 +1909,8 @@ sal_Bool SwTxtNode::SetAttr(
             if ( bAutoStyle )
             {
                 boost::shared_ptr<SfxItemSet> pAutoStyleSet = static_cast<const SwFmtAutoFmt*>(pItem)->GetStyleHandle();
-                sal_Bool bRet = SetAttr( *pAutoStyleSet );
-                  if( 1 == aTxtSet.Count() )
+                const bool bRet = SetAttr( *pAutoStyleSet );
+                if( 1 == aTxtSet.Count() )
                     return bRet;
             }
 
@@ -1988,7 +1988,7 @@ sal_Bool SwTxtNode::SetAttr(
 
     TryDeleteSwpHints();
 
-    return nCount ? sal_True : sal_False;
+    return nCount != 0;
 }
 
 static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr )
@@ -2079,8 +2079,8 @@ static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode,
 }
 
 // erfrage die Attribute vom TextNode ueber den Bereich
-sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
-                         sal_Bool bOnlyTxtAttr, sal_Bool bGetFromChrFmt,
+bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
+                         const bool bOnlyTxtAttr, const bool bGetFromChrFmt,
                          const bool bMergeIndentValuesOfNumRule ) const
 {
     if( HasHints() )
@@ -2294,7 +2294,7 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
         }
     }
 
-    return rSet.Count() ? sal_True : sal_False;
+    return rSet.Count() != 0;
 }
 
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 7ab20bd7e211..79baeecd3ebe 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -374,7 +374,7 @@ void SwTxtNode::RstTxtAttr(
     const sal_Int32 nLen,
     const sal_uInt16 nWhich,
     const SfxItemSet* pSet,
-    const sal_Bool bInclRefToxMark )
+    const bool bInclRefToxMark )
 {
     if ( !GetpSwpHints() )
         return;
@@ -1574,7 +1574,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, sal_Int32 nActPos )
 }
 
 /** Findet den TxtFrm und sucht dessen CalcHyph */
-sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
+bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
     // Abkuerzung: am Absatz ist keine Sprache eingestellt:
     if ( LANGUAGE_NONE == sal_uInt16( GetSwAttrSet().GetLanguage().GetLanguage() )
@@ -1582,7 +1582,7 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
     {
         if( !rHyphInf.IsCheck() )
             rHyphInf.SetNoLang( true );
-        return sal_False;
+        return false;
     }
 
     if( pLinguNode != this )
@@ -1599,7 +1599,7 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
         // moeglich, in denen kein Frame zum Node vorliegt.
         // Also keinOSL_ENSURE
         OSL_ENSURE( pFrm, "!SwTxtNode::Hyphenate: can't find any frame" );
-        return sal_False;
+        return false;
     }
 
     while( pFrm )
@@ -1610,7 +1610,7 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
             // (7821, 7662, 7408); vgl. layact.cxx,
             // SwLayAction::_TurboAction(), if( !pCnt->IsValid() ...
             pFrm->SetCompletePaint();
-            return sal_True;
+            return true;
         }
         pFrm = (SwTxtFrm*)(pFrm->GetFollow());
         if( pFrm )
@@ -1619,7 +1619,7 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
             rHyphInf.nStart = pFrm->GetOfst();
         }
     }
-    return sal_False;
+    return false;
 }
 
 namespace
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 5572cfacafe9..73a69649191f 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -1244,7 +1244,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         short nOffset = static_cast< short >(aLR.GetTxtLeft() +
                                         // #i42922# Mouse move of numbering label
                                         // has to consider the left indent of the paragraph
-                                        m_pNumRuleNodeFromDoc->GetLeftMarginWithNum( sal_True ) );
+                                        m_pNumRuleNodeFromDoc->GetLeftMarginWithNum( true ) );
 
                         short nFLOffset;
                         m_pNumRuleNodeFromDoc->GetFirstLineOfsWithNum( nFLOffset );