sal_True/sal_False to true/false in sw comments (also delete obsolete ones)

Change-Id: Ifb29bd3e9c5dc7671c189fd9daa010305f7a85a4

54 files changed, 74 insertions, 87 deletions

diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 4a75581cfa98..3cc2ca663dd4 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -593,11 +593,11 @@ uno::Reference< XAccessible> SAL_CALL
             {
                 FireStateChangedEvent( AccessibleStateType::FOCUSED,true );
                 // OFFSCREEN == !SHOWING, should stay consistent
-                // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True );
+                // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,true );
                 FireStateChangedEvent( AccessibleStateType::SHOWING,true );
                 FireStateChangedEvent( AccessibleStateType::BUSY,false );
                 // OFFSCREEN again?
-                // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False );
+                // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false );
             }
             bBeginDocumentLoad = false;
         }
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 4afcba5378d8..2fe410ea4983 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -576,14 +576,14 @@ void SAL_CALL SwAccessibleDocument::notifyEvent( const ::com::sun::star::documen
     else if ( Event.EventName.equalsAscii( "LoadFinished" ) )
     {
         // IA2 CWS. MT: OFFSCREEN == !SHOWING, should stay consistent
-        // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True );
+        // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,true );
         // MT: LoadFinished => Why not SHOWING == TRUE?
         FireStateChangedEvent( AccessibleStateType::SHOWING,false );
     }
     else if ( Event.EventName.equalsAscii( "FormatFinished" ) )
     {
         FireStateChangedEvent( AccessibleStateType::BUSY,false );
-        // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False );
+        // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false );
         FireStateChangedEvent( AccessibleStateType::SHOWING,true );
     }
     else
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 92e75a4b9199..1d94b37cd182 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1439,7 +1439,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
 }
 
 //Marge with DoInvalidateShapeFocus
-void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=sal_False*/)
+void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=false*/)
 {
     SwAccessibleObjShape_Impl *pShapes = 0;
     SwAccessibleObjShape_Impl *pSelShape = 0;
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index a55a44a67197..a2a8bd39a6bd 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -181,7 +181,6 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
 void SwAccessibleSelectionHelper::clearAccessibleSelection(  )
     throw ( RuntimeException )
 {
-    // return sal_False     // we can't deselect
 }
 
 void SwAccessibleSelectionHelper::selectAllAccessibleChildren(  )
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index da6a6eb207bd..e5271b344921 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -400,7 +400,7 @@ SwSbxValue SwCalc::Calculate( const OUString& rStr )
 /** ???
 
   @param rVal ???
-  @param bRound In previous times <bRound> had a default value of <sal_True>.
+  @param bRound In previous times <bRound> had a default value of <true>.
                 There it should be only changed when calculating table cells,
                 so that no rounding errors would occur while composing a formula.
                 Now this parameter is ignored.
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index 1f57fe12a630..5e5cc6d76507 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -29,7 +29,7 @@ SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) :
     push_back( aOrigin );
 }
 
-// If <rDel> is sal_True then this Rect will be overwritten by <rRect> at
+// If <rDel> is true then this Rect will be overwritten by <rRect> at
 // position <nPos>. Otherwise <rRect> is attached at the end.
 inline void SwRegionRects::InsertRect( const SwRect &rRect,
                                        const sal_uInt16 nPos, bool &rDel )
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index cb0341f4088e..0dfa7b172373 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2334,7 +2334,7 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
 /** Move visible cursor to given position in document.
 
     @param rPt The position to move the visible cursor to.
-    @return <sal_False> if SPoint was corrected by the layout.
+    @return <false> if SPoint was corrected by the layout.
 */
 bool SwCrsrShell::SetVisCrsr( const Point &rPt )
 {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f5d863f0a3e5..4646ecc4834f 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -732,7 +732,7 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
     }
 }
 
-// Returns sal_True if we can proceed.
+// Returns true if we can proceed.
 static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
 {
     // Hyphenate returns true if there is a hyphenation point and sets pPam
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 98a0347b0137..67cddeadc6fc 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -396,7 +396,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
 
     // Is the anchor attribute included?
-    // If so, we pass it to a special method, which returns sal_True
+    // If so, we pass it to a special method, which returns true
     // if the Fly needs to be created anew, because we e.g change the FlyType.
     sal_Int8 const nMakeFrms =
         (SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false ))
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4797a5bd693f..3915fa8b0e94 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1280,7 +1280,7 @@ bool SwDoc::NoNum( const SwPaM& rPam )
             getIDocumentState().SetModified();
         }
         else
-            bRet = false;   // no Numbering or just always sal_True?
+            bRet = false;   // no Numbering or just always true?
     }
     return bRet;
 }
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 9f45a32ca2e7..8ee16387eb4d 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -252,7 +252,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     if( pGrfNd )
         pGrfNd->SetFrameInPaint( true );
 
-    // #i13147# - add 2nd parameter with value <sal_True> to
+    // #i13147# - add 2nd parameter with value <true> to
     // method call <FindFlyFrm().GetContour(..)> to indicate that it is called
     // for paint in order to avoid load of the intrinsic graphic.
     if ( ( !pOut->GetConnectMetaFile() ||
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 0dd85ad45d0f..4836b63581d0 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -558,7 +558,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
             SwPosition aMvPos( aInsIdx );
             SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
-            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, /*sal_True*/false );
+            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index d70d70e577d6..de1f3d481146 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -696,9 +696,9 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
     else
         sSectName.clear();
 
-    /// In SwSection::operator=(..) class member bCondHiddenFlag is always set to sal_True.
+    /// In SwSection::operator=(..) class member m_bCondHiddenFlag is always set to true.
     /// IMHO this have to be changed, but I can't estimate the consequences:
-    /// Either it is set to sal_True using corresponding method <SwSection.SetCondHidden(..)>,
+    /// Either it is set to true using corresponding method <SwSection.SetCondHidden(..)>,
     /// or it is set to the value of SwSection which is assigned to it.
     /// Discussion with AMA results that the adjustment to the assignment operator
     /// could be very risky.
@@ -723,9 +723,9 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
 
         /// Because on using SwSection::operator=() to set up <pSection>
         /// with <rNewData> and the above given note, the hidden condition flag
-        /// has to be set to sal_False, if hidden condition flag of <pFmt->GetSection()>
-        /// (SwSection before the changes) is sal_False (already saved in <bOldCondHidden>)
-        /// and new calculated condition is sal_True.
+        /// has to be set to false, if hidden condition flag of <pFmt->GetSection()>
+        /// (SwSection before the changes) is false (already saved in <bOldCondHidden>)
+        /// and new calculated condition is true.
         /// This is necessary, because otherwise the <SetCondHidden> would have
         /// no effect.
         bool bCalculatedCondHidden =
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 344d54eb620a..48b20185a687 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -986,7 +986,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                         }
                         else if ((aSetBox.GetTop() && rBox.GetTop() &&
                                  !(*aSetBox.GetTop() == *rBox.GetTop())) ||
-                                 ((!aSetBox.GetTop()) != (!rBox.GetTop()))) // XOR expression is sal_True, if one of the two pointers is 0
+                                 ((!aSetBox.GetTop()) != (!rBox.GetTop()))) // != expression is true, if one and only one of the two pointers is !0
                         {
                             aSetBoxInfo.SetValid(VALID_TOP, false );
                             aSetBox.SetLine( 0, BOX_LINE_TOP );
@@ -1345,14 +1345,14 @@ static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabC
  *
  * We do not iterate over the TabCols' entries, but over the gaps that describe Cells.
  *
- * @param bWishValues == sal_True: We calculate the desired value of all affected
+ * @param bWishValues == true:     We calculate the desired value of all affected
  *                                 Cells for the current Selection/current Cell.
  *                                 If more Cells are within a Column, the highest
  *                                 desired value is returned.
  *                                 We set TabCol entries for which we did not calculate
  *                                 Cells to 0.
  *
- * @param bWishValues == sal_False: The Selection is expanded vertically.
+ * @param bWishValues == false:     The Selection is expanded vertically.
  *                                  We calculate the minimum value for every
  *                                  Column in the TabCols that intersects with the
  *                                  Selection.
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 8f80d9180bfb..538b4197143f 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -124,7 +124,7 @@ SwNode* GoPreviousWithFrm(SwNodeIndex *pIdx)
 /**
  * The main purpose of this ctor is to find the right SwModify to iterate over.
  *
- * @param bSearch sal_True: find the next Content or TableNode which contains
+ * @param bSearch true:     find the next Content or TableNode which contains
  *                          Frames (to collect the pUpper).
  *                          Else we assume that rNode points already to such a
  *                          Content or TableNode.
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index f20f36e79fb5..825a1996c7e2 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -159,7 +159,7 @@ SwContact* GetUserCall( const SdrObject* pObj )
     return static_cast<SwContact*>(pObj->GetUserCall());
 }
 
-/// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
+/// Returns true if the SrdObject is a Marquee-Object (scrolling text)
 bool IsMarqueeTextObj( const SdrObject& rObj )
 {
     SdrTextAniKind eTKind;
@@ -582,7 +582,7 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
     mbDisconnectInProgress( false ),
     mbUserCallActive( false ),
     // Note: value of <meEventTypeOfCurrentUserCall> isn't of relevance, because
-    //       <mbUserCallActive> is sal_False.
+    //       <mbUserCallActive> is false.
     meEventTypeOfCurrentUserCall( SDRUSERCALL_MOVEONLY )
 {
     // clear list containing 'virtual' drawing objects.
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 700a6296b872..3f87623d14da 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -378,8 +378,6 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
     SdrVirtObj( rNew ),
     pFlyFrm( pFly )
 {
-    //#110094#-1
-    // bNotPersistent = bNeedColorRestore = bWriterFlyFrame = sal_True;
     const SvxProtectItem &rP = pFlyFrm->GetFmt()->GetProtect();
     bMovProt = rP.IsPosProtected();
     bSizProt = rP.IsSizeProtected();
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index c3542b9b0c51..2b8d882ac7ba 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -496,7 +496,7 @@ bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
         else if( rCC.isLetterNumeric( rStr, n ))
             ++nANChar;
 
-    // If there are 75% of non-alphanumeric characters, then sal_True
+    // If there are 75% of non-alphanumeric characters, then true
     sal_uLong nLen = rStr.getLength() - nBlnk;
     nLen = ( nLen * 3 ) / 4;            // long overflow, if the strlen > sal_uInt16
     return sal_Int32(nLen) < (rStr.getLength() - nANChar - nBlnk);
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 15203f4dfec3..bf7c347dec70 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -263,7 +263,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
 
 /** Get text in a Selection
  *
- * @return sal_False if the selected area is too big for being copied into the string buffer
+ * @return false if the selected area is too big for being copied into the string buffer
  */
 bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
 {
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index e4d84f513330..6785e7ff42ba 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -725,9 +725,9 @@ uno::Any SwEditShell::SpellContinue(
  *              - SwTxtFrm:Hyphenate() iterates over all rows of the Pam
  *                  - LineIter::Hyphenate() sets the Hyphenator and the Pam based on
  *                    the to be separated word.
- *    - Returns sal_True if there is a hyphenation and sal_False if the Pam is processed.
- *      - If sal_True, show the selected word and set nLastHyphLen.
- *      - If sal_False, delete current selection and select next one. Returns HYPH_OK if no more.
+ *    - Returns true if there is a hyphenation and false if the Pam is processed.
+ *      - If true, show the selected word and set nLastHyphLen.
+ *      - If false, delete current selection and select next one. Returns HYPH_OK if no more.
  * 3) InsertSoftHyph (might be called by UI if needed)
  *    - Place current cursor and add attribute.
  * 4) HyphEnd
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 43ca2eaf0872..13535e224113 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -272,7 +272,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm() const
     return 0;
 }
 
-// Returns sal_True, if the current Fly could be anchored to another one (so it is inside)
+// Returns non-null pointer, if the current Fly could be anchored to another one (so it is inside)
 const SwFrmFmt* SwFEShell::IsFlyInFly()
 {
     SET_CURR_SHELL( this );
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 6c4a84ab8ef7..97341acdaadc 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2390,8 +2390,8 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
                                             const bool bBehind )
 {
     // Create Frms for newly inserted lines
-    // bBehind == sal_True:  before  pLineBehind
-    //         == sal_False: after   pLineBefore
+    // bBehind == true:  before  pLineBehind
+    //         == false: after   pLineBefore
     const sal_uInt16 nBfPos = pLineBefore ?
         rTable.GetTabLines().GetPos( (const SwTableLine*&)pLineBefore ) :
         USHRT_MAX;
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index cebf082a950a..edad8122e92d 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -595,7 +595,7 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
 }
 
 /// Return the next layout leaf in that the frame can be moved.
-/// New pages will only be created if the parameter is sal_True.
+/// New pages will only be created if specified by the parameter.
 SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
 {
     SwFtnBossFrm *pOldBoss = FindFtnBossFrm();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 70619a855a93..122567b2ab30 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -249,7 +249,6 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt,
         if( bHeightDiff )
         {
             // OD 05.11.2002 #94454# - consider whole potential paint area.
-            //SwRect aDrawRect( pCnt->UnionFrm( sal_True ) );
             SwRect aDrawRect( pCnt->PaintArea() );
             if( nOldHeight > nNewHeight )
                 nOldBottom = (pCnt->*fnRect->fnGetPrtBottom)();
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 0350cc6340e2..a3b5a188d1ed 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1417,7 +1417,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
 }
 
 /// Returns the next layout sheet where the frame can be moved in.
-/// New pages are created only if the parameter sal_True is set.
+/// New pages are created only if specified by the parameter.
 SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
 {
     // Attention: Nested sections are currently not supported
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index b4c8ef9edc7e..bbae9404a150 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -101,7 +101,6 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
             aParserInput.aInputStream = xStream->getInputStream();
 
             // get filter
-            // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, aCur, sal_True );
             uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, *this, aCur, true );
 
             // connect parser and filter
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index ad84ee396696..d34f7797c227 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -80,7 +80,7 @@ the boxes to remove
 @param pUndo
 the undo object to notify, maybe empty
 
-@return sal_True for compatibility reasons with OldMerge(..)
+@return true for compatibility reasons with OldMerge(..)
 */
 
 bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index fe4b25218b49..9a66c9be8aee 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1345,7 +1345,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
                             const bool bPerformValidCheck )
 {
     sal_uInt16 nRet = 0;
-    if( bFirstPart )   // sal_True == column; sal_False == row
+    if( bFirstPart )   // true == column; false == row
     {
         sal_Int32 nPos = 0;
         // the first one uses letters for addressing!
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 0146d4f2a9ce..759c856a5063 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1926,7 +1926,7 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
 
     // analog zu Insert(char) in txtedt.cxx:
     // 1) bei bHintExp leere Hints an rIdx.GetIndex suchen und aufspannen
-    // 2) bei bHintExp == sal_False mitgezogene Feldattribute zuruecksetzen
+    // 2) bei bHintExp == false mitgezogene Feldattribute zuruecksetzen
 
     if ( HasHints() )
     {
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 48cbf4995d6a..c24eba8b7596 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -171,8 +171,8 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
                          const bool _bAtCharAnchoredObjs )
 {
     // _bAtCharAnchoredObjs:
-    // <sal_True>: at-character anchored objects are collected
-    // <sal_False>: at-paragraph anchored objects are collected
+    // <true>: at-character anchored objects are collected
+    // <false>: at-paragraph anchored objects are collected
 
     // search all borders, images, and OLEs that are connected to the paragraph
     SwDoc* pDoc = rIdx.GetNode().GetDoc();
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 1d2bc1b828f9..2ebca729d2ba 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -292,7 +292,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwUnoInternalPaM aPam(*pDoc);
-    //das muss jetzt sal_True liefern
+    //das muss jetzt true liefern
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
     UnoActionContext aCont(pDoc);
     pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_INSSECTION, NULL );
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 6f949494497a..8b91e845fd01 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -746,7 +746,7 @@ void sw_setValue( SwXCell &rCell, double nVal )
         // first this text (maybe) needs to be deleted
         sal_uLong nNdPos = rCell.pBox->IsValidNumTxtNd( true );
         if(ULONG_MAX != nNdPos)
-            sw_setString( rCell, OUString(), true );   // sal_True == keep number format
+            sw_setString( rCell, OUString(), true );   // true == keep number format
         SwDoc* pDoc = rCell.GetDoc();
         UnoActionContext aAction(pDoc);
         SwFrmFmt* pBoxFmt = rCell.pBox->ClaimFrmFmt();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 8d42d63e5408..d6b22ae88176 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2116,7 +2116,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
         bReformat = GetDoc()->ContainsHiddenChars();
     }
 
-    // bReformat becomes sal_True, if ...
+    // bReformat becomes true, if ...
     // - fieldnames apply or not ...
     // ( - SwEndPortion must _no_ longer be generated. )
     // - Of course, the screen is something completely different than the printer ...
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 37e61ed54d7d..f32790cf5c98 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3163,7 +3163,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
 
     // get the color
     bool bColor = false;
-    /// set <bTransparent> to sal_True, if color is "no fill"/"auto fill"
+    /// set <bTransparent> to true, if color is "no fill"/"auto fill"
     bool bTransparent = (rColor.GetColor() == COL_TRANSPARENT);
     Color aColor;
     if( !bTransparent )
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index b25020687de1..c011dc17eba8 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2901,7 +2901,7 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
 }
 
 // Das ist jetzt unser Blink-Item. Blinkend wird eingeschaltet, indem man
-// das Item auf sal_True setzt!
+// das Item auf true setzt!
 static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 4b352c7e1852..bfe012fe9178 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4972,7 +4972,7 @@ public:
     virtual ~_TblSaveStruct();
 
     // Aufbau der Tabelle anstossen und die Tabelle ggf. in einen
-    // Rahmen packen. Wenn sal_True zurueckgegeben wird muss noch ein
+    // Rahmen packen. Wenn true zurueckgegeben wird muss noch ein
     // Absatz eingefuegt werden!
     void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc );
 };
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index c95fd50f4fbb..b0261afef8ba 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -624,7 +624,7 @@ void RtfExport::ExportDocument_Impl()
         // All sections are unlocked by default
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
         OutLong(1);
-        OutPageDescription(rPageDesc, false, true);     // Changed bCheckForFirstPage to sal_True so headers
+        OutPageDescription(rPageDesc, false, true);     // Changed bCheckForFirstPage to true so headers
         // following title page are correctly added - i13107
         if (pSttPgDsc)
         {
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8104530e84f7..d264ce4c0d82 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1925,11 +1925,11 @@ void SwWW8ImplReader::ImportDop()
     rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, true);
 
     // #i11860# - set new compatibility option
-    //      'Use former object positioning' to <sal_False>
+    //      'Use former object positioning' to <false>
     rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false);
 
     // #i27767# - set new compatibility option
-    //      'Conder Wrapping mode when positioning object' to <sal_True>
+    //      'Conder Wrapping mode when positioning object' to <true>
     rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true);
 
     rDoc.getIDocumentSettingAccess().set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135#
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 29f55b426ec0..5a6ecec68427 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -610,7 +610,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
         // Note: Text documents read via the binary filter are also finally
         //       read using the OpenOffice.org file format. Thus, e.g. for text
         //       documents in StarOffice 5.2 binary file format this property
-        //       will be sal_True.
+        //       will be true.
         { OUString("TextDocInOOoFileFormat"), 0,
               ::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 6f92051f3fee..48196c2cf6c1 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -220,7 +220,6 @@ void SwXMLExport::_ExportAutoStyles()
         }
 
         GetTextParagraphExport()->collectTextAutoStylesOptimized( bShowProgress );
-        //GetTextParagraphExport()->collectTextAutoStyles( xText, bShowProgress, sal_True, bPortions );
     }
 
     GetTextParagraphExport()->exportTextAutoStyles();
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index fb3ed88064a6..e1f2f46f2c8f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2350,7 +2350,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     if( bHoriSplitPossible || nSplitCol > nCol+1 )
                     {
                         OSL_ENSURE( !bHoriSplitMayContinue,
-                                "bHoriSplitMayContinue==sal_True" );
+                                "bHoriSplitMayContinue==true" );
                         OSL_ENSURE( bHoriSplitPossible || nSplitCol == nRightCol,
                                 "bHoriSplitPossible-Flag sollte gesetzt sein" );
 
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 740ed1c68fb5..e5f51147198c 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -605,8 +605,6 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet)
     bFormat(false),
     bNew(true),
     bNoModifyHdl(true),
-    // --> OD 2009-08-31 #mongolianlayout# - no used
-//    bVerticalChanged(sal_False),
     bIsVerticalFrame(false),
     bIsVerticalL2R(false),
     bIsInRightToLeft(false),
@@ -882,8 +880,6 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
     {
         if (rAnchor.GetAnchorId() != FLY_AT_FLY && !pSh->IsFlyInFly())
             m_pAnchorAtFrameRB->Hide();
-        // --> OD 2009-08-31 #mongolianlayout#
-//        if ( !bVerticalChanged && pSh->IsFrmVertical(sal_True, bIsInRightToLeft) )
         if ( pSh->IsFrmVertical( true, bIsInRightToLeft, bIsVerticalL2R ) )
         {
             OUString sHLabel = m_pHorizontalFT->GetText();
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index d65abfe36a8a..9aab2ff9e24d 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -370,7 +370,7 @@ bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
 
     // OM: if the name is among the new region name, it is deletable
     // as well! Because for non existing region names ReadOnly issues
-    // sal_True.
+    // true.
 
     for (OUVector_t::const_iterator it(m_InsertedArr.begin());
             it != m_InsertedArr.end(); ++it)
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 0c1a1a1d17bf..b0ef74f3c451 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -843,7 +843,7 @@ void AutoFmtPreview::CalcLineMap()
 void AutoFmtPreview::NotifyChange( const SwTableAutoFmt& rNewData )
 {
     aCurData  = rNewData;
-    bFitWidth = aCurData.IsJustify();//sal_True;  //???
+    bFitWidth = aCurData.IsJustify();  // true;  //???
     CalcCellArray( bFitWidth );
     CalcLineMap();
     DoPaint( Rectangle( Point(0,0), GetSizePixel() ) );
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 0cd1cefbb841..cc321aeb52d7 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -120,7 +120,7 @@ SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException,
 void SAL_CALL
 SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException, std::exception )
 {
-    // FIXME: handle the property Options.ReplaceSelection, the default value is sal_True
+    // FIXME: handle the property Options.ReplaceSelection, the default value is true
     setText( rText );
 }
 
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index c8efb7af92e6..fb8010a1f821 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -275,7 +275,7 @@ void SwLayoutViewConfig::Commit()
             case  1: rVal <<= rParent.IsViewHScrollBar(); break;         // "Window/HorizontalScroll",
             case  2: rVal <<= rParent.IsViewVScrollBar(); break;         // "Window/VerticalScroll",
             case  3: rVal <<= rParent.IsViewAnyRuler(); break;           // "Window/ShowRulers"
-            // #i14593# use IsView*Ruler(sal_True) instead of IsView*Ruler()
+            // #i14593# use IsView*Ruler(true) instead of IsView*Ruler()
             // this preserves the single ruler states even if "Window/ShowRulers" is off
             case  4: rVal <<= rParent.IsViewHRuler(true); break;         // "Window/HorizontalRuler",
             case  5: rVal <<= rParent.IsViewVRuler(true); break;         // "Window/VerticalRuler",
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index bf500429d506..4aea94f75545 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2372,7 +2372,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
                     // rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic );
                     // Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() );
-                    // SwTransferable::SetSelInShell( rSh, sal_True, &aPt );
+                    // SwTransferable::SetSelInShell( rSh, true, &aPt );
                 }
                 else
                 {
diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx
index 9e567a765d20..adc4f9cb91b0 100644
--- a/sw/source/uibase/fldui/xfldui.cxx
+++ b/sw/source/uibase/fldui/xfldui.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans;
 // need any exception handling.
 
 // Is the database field numeric?
-// remark: in case of error sal_True is returned
+// remark: in case of error true is returned
 bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName,
                             bool bIsTable, const OUString& rFldName)
 {
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 8aba0debcbc9..c453185db05e 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -453,8 +453,8 @@ void SwDrawBase::Deactivate()
 
 // Process keyboard events
 
-// If a KeyEvent is processed then the return value is sal_True, otherwise
-// Sal_False.
+// If a KeyEvent is processed then the return value is true, otherwise
+// false.
 
 bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
 {
@@ -538,8 +538,8 @@ bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
 
 // Process keyboard events
 
-// If a KeyEvent is processed then the return value is sal_True, otherwise
-// Sal_False.
+// If a KeyEvent is processed then the return value is true, otherwise
+// false.
 
 void SwDrawBase::BreakCreate()
 {
diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx
index 60c1a06fec8e..5afb6c237899 100644
--- a/sw/source/uibase/ribbar/dselect.cxx
+++ b/sw/source/uibase/ribbar/dselect.cxx
@@ -33,8 +33,8 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView*
 
 // Process keyboard events
 
-// If a KeyEvent is processed then the return value is sal_True, otherwise
-// Sal_False.
+// If a KeyEvent is processed then the return value is true, otherwise
+// false.
 
 bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
 {
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index fc3d0ddacd8c..51d9a9d030aa 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -617,7 +617,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case FN_AUTOFORMAT_REDLINE_APPLY:
         {
             SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
-            // This must always be sal_False for the postprocessing.
+            // This must always be false for the postprocessing.
             aFlags.bAFmtByInput = false;
             aFlags.bWithRedlining = true;
             rWrtSh.AutoFormat( &aFlags );
@@ -660,7 +660,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case FN_AUTOFORMAT_APPLY:
         {
             SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
-            // This must always be sal_False for the postprocessing.
+            // This must always be false for the postprocessing.
             aFlags.bAFmtByInput = false;
             rWrtSh.AutoFormat( &aFlags );
             rReq.Done();
@@ -1062,7 +1062,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
                 if( SfxItemState::SET == pSet->GetItemState(FN_NUMBER_NEWSTART) )
                 {
-                    //SetNumRuleStart(sal_True) restarts the numbering at the value
+                    //SetNumRuleStart(true) restarts the numbering at the value
                     //that is defined at the starting point of the numbering level
                     //otherwise the SetNodeNumStart() value determines the start
                     //if it's set to something different than USHRT_MAX
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index daf170072ef9..977d6e65d2eb 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -920,9 +920,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     m_pWrtShell->SetChgLnk(LINK(this, SwView, AttrChangedNotify));
 
     if( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
-        //TODO/LATER: why a cast here?
-        //!((SvEmbeddedObject *)pDocSh)->GetVisArea().IsEmpty() )
-        //SetVisArea( ((SvEmbeddedObject *)pDocSh)->GetVisArea(),sal_False);
         !pDocSh->GetVisArea(ASPECT_CONTENT).IsEmpty() )
         SetVisArea( pDocSh->GetVisArea(ASPECT_CONTENT),false);
 
@@ -1556,7 +1553,7 @@ ErrCode SwView::DoVerb( long nVerb )
     return ERRCODE_NONE;
 }
 
-//   only return sal_True for a text selection
+//   only return true for a text selection
 
 bool SwView::HasSelection( bool  bText ) const
 {
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 8f04c4a4ef15..02870aaf5851 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -128,7 +128,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
 
     uno::Reference< text::XAutoTextGroup > xGroup;
     if ( pGlossaries && hasByName( GroupName ) )    // group name already known?
-        // sal_True = create group if not already available
+        // true = create group if not already available
         xGroup = pGlossaries->GetAutoTextGroup( GroupName, true );
 
     if ( !xGroup.is() )
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index e9168cc74b78..48fc4cc5ea28 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -452,7 +452,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm
     //   break should be insertet. StarMath objects are character bound and
     //   no break should be inserted.
     //3. If an selection is passed to a StarMath object, this object should
-    //   not be activated. sal_False should be returned then.
+    //   not be activated. false should be returned then.
     bool bStarMath = true;
     bool bActivate = true;
 
@@ -975,8 +975,8 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
 
 // -> #i40041#
 // Preconditions (as far as OD has figured out):
-// - <SwEditShell::HasNumber()> is sal_False, if <bNum> is sal_True
-// - <SwEditShell::HasBullet()> is sal_False, if <bNum> is sal_False
+// - <SwEditShell::HasNumber()> is false, if <bNum> is true
+// - <SwEditShell::HasBullet()> is false, if <bNum> is false
 // Behavior of method is determined by the current situation at the current
 // cursor position in the document.
 void SwWrtShell::NumOrBulletOn(bool bNum)
@@ -989,12 +989,12 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
     const SwNumRule * pNumRule = pCurRule;
 
     // - activate outline rule respectively turning on outline rule for
-    //   current text node. But, only for turning on a numbering (<bNum> == sal_True).
+    //   current text node. But, only for turning on a numbering (<bNum> == true).
     // - overwrite found numbering rule at current cursor position, if
     //   no numbering rule can be retrieved from the paragraph style.
     bool bContinueFoundNumRule( false );
     bool bActivateOutlineRule( false );
-    int nActivateOutlineLvl( MAXLEVEL );    // only relevant, if <bActivateOutlineRule> == sal_True
+    int nActivateOutlineLvl( MAXLEVEL );    // only relevant, if <bActivateOutlineRule> == true
     SwTxtFmtColl * pColl = GetCurTxtFmtColl();
     if ( pColl )
     {
@@ -1055,7 +1055,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 {
                     // #i101234#
                     // activate outline numbering, because from the precondition
-                    // it's known, that <SwEdit::HasNumber()> == sal_False
+                    // it's known, that <SwEdit::HasNumber()> == false
                     bActivateOutlineRule = true;
                     nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();
                 }
@@ -1070,7 +1070,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                                 == SVX_NUM_NUMBER_NONE )
                 {
                     // activate outline numbering, because from the precondition
-                    // it's known, that <SwEdit::HasNumber()> == sal_False
+                    // it's known, that <SwEdit::HasNumber()> == false
                     bActivateOutlineRule = true;
                 }
                 else