sal_Bool to bool

Change-Id: Ieeebcd89ae2728c6314f28413759bbb353c327bf

25 files changed, 84 insertions, 84 deletions

diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 893ec73b841e..4142ff9a518a 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -141,7 +141,7 @@ protected:
     static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool bProgName );
     static const String& getNameFromId ( sal_uInt16 nId, const String &rName, sal_Bool bProgName );
     static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool bProgName );
-    static sal_Bool SuffixIsUser ( const String & rString );
+    static bool SuffixIsUser ( const String & rString );
     static void CheckSuffixAndDelete ( String & rString );
 
 public:
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 8e0dd750141a..6d86722442c4 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -59,7 +59,7 @@ public:
     SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 );
     ~SwAutoCompleteWord();
 
-    sal_Bool InsertWord( const String& rWord, SwDoc& rDoc );
+    bool InsertWord( const String& rWord, SwDoc& rDoc );
 
     sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const;
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index e8678e99d783..fc421d2358c4 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -901,7 +901,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs()
 inline void SwCrsrShell::UnSetVisCrsr()
 {
     pVisCrsr->Hide();
-    pVisCrsr->SetDragCrsr( sal_False );
+    pVisCrsr->SetDragCrsr( false );
 }
 
 #endif  // _CRSRSH_HXX
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 682a97aaba71..76a7ef4767dd 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1835,7 +1835,7 @@ public:
     /// restore the invisible content if it's available on the undo stack
     bool RestoreInvisibleContent();
 
-    sal_Bool ConvertFieldsToText();
+    bool ConvertFieldsToText();
 
     /// Create sub-documents according to given collection.
     /// If no collection is given, use chapter styles for 1st level.
@@ -1883,7 +1883,7 @@ public:
 
     // -------------------- Uno - Interfaces ---------------------------
     const SwUnoCrsrTbl& GetUnoCrsrTbl() const       { return *pUnoCrsrTbl; }
-    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr = sal_False );
+    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
 
     // -------------------- FeShell - Interfaces -----------------------
     // !!! These assume always an existing layout !!!
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 58d8befd6231..ba5fcbd3d133 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -206,7 +206,7 @@ public:
     sal_Bool RemoveInvisibleContent();
 
     /// Replace fields by text - mailmerge support.
-    sal_Bool ConvertFieldsToText();
+    bool ConvertFieldsToText();
 
     /// Set all numbering start points to a fixed value - mailmerge support.
     void SetNumberingRestart();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index f8b274bfaa83..f9ef4eafd458 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -43,8 +43,8 @@ class SwVisCrsr
     friend void _InitCore();
     friend void _FinitCore();
 
-    sal_Bool bIsVisible : 1;
-    sal_Bool bIsDragCrsr : 1;
+    bool bIsVisible : 1;
+    bool bIsDragCrsr : 1;
 
     Cursor aTxtCrsr;
     const SwCrsrShell* pCrsrShell;
@@ -58,8 +58,8 @@ public:
     void Show();
     void Hide();
 
-    sal_Bool IsVisible() const { return bIsVisible; }
-    void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; }
+    bool IsVisible() const { return bIsVisible; }
+    void SetDragCrsr( bool bFlag = true ) { bIsDragCrsr = bFlag; }
 };
 
 
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f37a4b7c97a7..8dfc238133a3 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1194,10 +1194,10 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
 void SwCrsrShell::VisPortChgd( const SwRect & rRect )
 {
     SET_CURR_SHELL( this );
-    sal_Bool bVis; // switch off all cursors when scrolling
+    bool bVis; // switch off all cursors when scrolling
 
     // if a cursor is visible then hide the SV cursor
-    if( sal_True == ( bVis = pVisCrsr->IsVisible() ))
+    if( ( bVis = pVisCrsr->IsVisible() ) )
         pVisCrsr->Hide();
 
     bVisPortChgd = sal_True;
@@ -2317,7 +2317,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
             aCrsrHeight.Y() = aCharRect.Height();
         }
 
-        pVisCrsr->SetDragCrsr( sal_True );
+        pVisCrsr->SetDragCrsr( true );
         pVisCrsr->Show(); // show again
     }
     return bRet;
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 43f3d71b9cc1..d5dde71db4bb 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -79,7 +79,7 @@ SwUnoTableCrsr * SwUnoTableCrsr::Clone() const
 {
     SwUnoTableCrsr * pNewCrsr = dynamic_cast<SwUnoTableCrsr*>(
         GetDoc()->CreateUnoCrsr(
-            *GetPoint(), sal_True /* create SwUnoTableCrsr */ ) );
+            *GetPoint(), true /* create SwUnoTableCrsr */ ) );
     OSL_ENSURE(pNewCrsr, "Clone: cannot create SwUnoTableCrsr?");
     if (HasMark())
     {
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 88d840480b0c..1af6a6efad80 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -68,7 +68,7 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
 {
     pCShell->GetWin()->SetCursor( &aTxtCrsr );
     bIsVisible = aTxtCrsr.IsVisible();
-    bIsDragCrsr = sal_False;
+    bIsDragCrsr = false;
     aTxtCrsr.SetWidth( 0 );
 }
 
@@ -89,7 +89,7 @@ void SwVisCrsr::Show()
 {
     if( !bIsVisible )
     {
-        bIsVisible = sal_True;
+        bIsVisible = true;
 
         // display at all?
         if( pCrsrShell->VisArea().IsOver( pCrsrShell->aCharRect ) )
@@ -103,7 +103,7 @@ void SwVisCrsr::Hide()
 {
     if( bIsVisible )
     {
-        bIsVisible = sal_False;
+        bIsVisible = false;
 
         if( aTxtCrsr.IsVisible() )      // Shouldn't the flags be in effect?
             aTxtCrsr.Hide();
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 794bb3aa706d..a5653364b5e9 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -314,11 +314,11 @@ const struct SwTableEntry NumRuleProgNameTable [] =
 };
 #undef ENTRY
 
-sal_Bool SwStyleNameMapper::SuffixIsUser ( const String & rString )
+bool SwStyleNameMapper::SuffixIsUser ( const String & rString )
 {
     const sal_Unicode *pChar = rString.GetBuffer();
     sal_Int32 nLen = rString.Len();
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( nLen > 8 &&
         pChar[nLen-7] == ' ' &&
         pChar[nLen-6] == '(' &&
@@ -327,7 +327,7 @@ sal_Bool SwStyleNameMapper::SuffixIsUser ( const String & rString )
         pChar[nLen-3] == 'e' &&
         pChar[nLen-2] == 'r' &&
         pChar[nLen-1] == ')' )
-        bRet = sal_True;
+        bRet = true;
     return bRet;
 }
 void SwStyleNameMapper::CheckSuffixAndDelete ( String & rString )
@@ -468,10 +468,10 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         break;
     }
 #ifdef _NEED_TO_DEBUG_MAPPING
-    static sal_Bool bTested = sal_False;
+    static bool bTested = false;
     if ( !bTested )
     {
-        bTested = sal_True;
+        bTested = true;
         {
             for ( sal_uInt16 nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId < RES_POOLCOLL_TEXT_END ; nId++,nIndex++ )
             {
@@ -1086,7 +1086,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleProgNameArray()
 const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIName )
 {
     String aRes = rExtraUIName;
-    sal_Bool bChgName = sal_False;
+    bool bChgName = false;
     const boost::ptr_vector<String>& rExtraArr(GetExtraUINameArray());
     static sal_uInt16 nIds[] =
     {
@@ -1101,7 +1101,7 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN
     {
         if (aRes == rExtraArr[ *pIds ])
         {
-            bChgName = sal_True;
+            bChgName = true;
             break;
         }
     }
@@ -1113,7 +1113,7 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN
 const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgName )
 {
     String aRes = rExtraProgName;
-    sal_Bool bChgName = sal_False;
+    bool bChgName = false;
     const boost::ptr_vector<String>& rExtraArr(GetExtraProgNameArray());
     static sal_uInt16 nIds[] =
     {
@@ -1129,7 +1129,7 @@ const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgN
     {
         if (aRes == rExtraArr[ *pIds ])
         {
-            bChgName = sal_True;
+            bChgName = true;
             break;
         }
     }
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 65ce21aa47c3..5b86147a61f0 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -245,7 +245,7 @@ SwAutoCompleteWord::~SwAutoCompleteWord()
 #endif
 }
 
-sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
+bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
 {
     SwDocShell* pDocShell = rDoc.GetDocShell();
     SfxMedium* pMedium = pDocShell ? pDocShell->GetMedium() : 0;
@@ -262,7 +262,7 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
     aNewWord = comphelper::string::remove(aNewWord, CH_TXTATR_BREAKWORD);
 
     pImpl->AddDocument(rDoc);
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     xub_StrLen nWrdLen = aNewWord.Len();
     while( nWrdLen && '.' == aNewWord.GetChar( nWrdLen-1 ))
         --nWrdLen;
@@ -278,7 +278,7 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
 
         if (aInsPair.second)
         {
-            bRet = sal_True;
+            bRet = true;
             if (aLRULst.size() >= nMaxCount)
             {
                 // the last one needs to be removed
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 6854be4f53ad..3719ef581442 100755
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -722,7 +722,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode)
         return NULL;
 }
 
-sal_Bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs)
+bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs)
 {
     if (pNode)
     {
@@ -731,7 +731,7 @@ sal_Bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs)
     }
 
     //MBA: this code didn't compile, needed to add a return value
-    return sal_True;
+    return true;
 }
 
 void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, sal_uLong & nIndex)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index af8717ea0421..2a67f675b864 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -676,8 +676,8 @@ const JobSetup* SwDoc::getJobsetup() const
 
 void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
 {
-    sal_Bool bCheckPageDescs = 0 == pPrt;
-    sal_Bool bDataChanged = sal_False;
+    bool bCheckPageDescs = 0 == pPrt;
+    bool bDataChanged = false;
 
     if ( pPrt )
     {
@@ -686,7 +686,7 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
             if ( pPrt->GetJobSetup() != rJobSetup )
             {
                 pPrt->SetJobSetup( rJobSetup );
-                bDataChanged = sal_True;
+                bDataChanged = true;
             }
         }
         else
@@ -708,7 +708,7 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
         else
         {
             pPrt = p;
-            bDataChanged = sal_True;
+            bDataChanged = true;
         }
     }
     if ( bDataChanged && !get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) )
@@ -2128,7 +2128,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool
         while( aIndx < aEndOfDoc )
         {
             SwNode *pNode;
-            sal_Bool bDelete = sal_False;
+            bool bDelete = false;
             if( (pNode = &aIndx.GetNode())->IsTxtNode() )
             {
                 SwTxtNode *pNd = (SwTxtNode*)pNode;
@@ -2148,7 +2148,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool
                 if( !pNd->Len() &&
                     pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() )
                 {
-                    bDelete = sal_True;
+                    bDelete = true;
                     pExtDoc->GetNodes().Delete( aIndx );
                 }
             }
@@ -2162,7 +2162,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool
 // Remove the invisible content from the document e.g. hidden areas, hidden paragraphs
 bool SwDoc::RemoveInvisibleContent()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL );
 
     {
@@ -2175,7 +2175,7 @@ bool SwDoc::RemoveInvisibleContent()
                 pTxtNd->GetpSwpHints() && pTxtNd->HasHiddenParaField() &&
                 &pTxtNd->GetNodes() == &GetNodes() )
             {
-                bRet = sal_True;
+                bRet = true;
                 SwPaM aPam( *pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().Len() );
 
                 // Remove hidden paragraph or delete contents:
@@ -2211,7 +2211,7 @@ bool SwDoc::RemoveInvisibleContent()
             if ( pTxtNd->HasHiddenCharAttribute( true ) )
             {
                 bRemoved = sal_True;
-                bRet = sal_True;
+                bRet = true;
 
                 // Remove hidden paragraph or delete contents:
                 // Delete contents if
@@ -2234,7 +2234,7 @@ bool SwDoc::RemoveInvisibleContent()
             else if ( pTxtNd->HasHiddenCharAttribute( false ) )
             {
                 bRemoved = sal_True;
-                bRet = sal_True;
+                bRet = true;
                 SwScriptInfo::DeleteHiddenRanges( *pTxtNd );
             }
 
@@ -2290,7 +2290,7 @@ bool SwDoc::RemoveInvisibleContent()
                 SwSectionNode* pSectNd = pSectFmt->GetSectionNode();
                 if( pSectNd )
                 {
-                    bRet = sal_True;
+                    bRet = true;
                     SwPaM aPam( *pSectNd );
 
                     if( pSectNd->StartOfSectionNode()->StartOfSectionIndex() ==
@@ -2332,11 +2332,11 @@ bool SwDoc::RemoveInvisibleContent()
 
 bool SwDoc::HasInvisibleContent() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SwClientIter aIter( *GetSysFldType( RES_HIDDENPARAFLD ) );
     if( aIter.First( TYPE( SwFmtFld ) ) )
-        bRet = sal_True;
+        bRet = true;
 
     //
     // Search for any hidden paragraph (hidden text attribute)
@@ -2351,7 +2351,7 @@ bool SwDoc::HasInvisibleContent() const
                 SwPaM aPam( *pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().Len() );
                 if( pTxtNd->HasHiddenCharAttribute( true ) ||  ( pTxtNd->HasHiddenCharAttribute( false ) ) )
                 {
-                    bRet = sal_True;
+                    bRet = true;
                 }
             }
         }
@@ -2370,7 +2370,7 @@ bool SwDoc::HasInvisibleContent() const
                 continue;
             SwSection* pSect = pSectFmt->GetSection();
             if( pSect->IsHidden() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
@@ -2391,9 +2391,9 @@ bool SwDoc::RestoreInvisibleContent()
 }
 
 
-sal_Bool SwDoc::ConvertFieldsToText()
+bool SwDoc::ConvertFieldsToText()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     LockExpFlds();
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE, NULL );
 
@@ -2524,7 +2524,7 @@ bool SwDoc::LinksUpdated() const
 }
 bool SwDoc::EmbedAllLinks()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sfx2::LinkManager& rLnkMgr = GetLinkManager();
     const ::sfx2::SvBaseLinks& rLinks = rLnkMgr.GetLinks();
     if( !rLinks.empty() )
@@ -2542,7 +2542,7 @@ bool SwDoc::EmbedAllLinks()
             if( xLink.Is() )
                 rLnkMgr.Remove( xLink );
 
-            bRet = sal_True;
+            bRet = true;
         }
 
         GetIDocumentUndoRedo().DelAllUndoObj();
@@ -2675,7 +2675,7 @@ bool SwDoc::ContainsHiddenChars() const
     return false;
 }
 
-SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr )
+SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr )
 {
     SwUnoCrsr* pNew;
     if( bTblCrsr )
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index bf454d788dfb..3ef955c1dcd2 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -835,10 +835,10 @@ sal_Bool SwEditShell::RemoveInvisibleContent()
     EndAllAction();
     return bRet;
 }
-sal_Bool SwEditShell::ConvertFieldsToText()
+bool SwEditShell::ConvertFieldsToText()
 {
     StartAllAction();
-    sal_Bool bRet = GetDoc()->ConvertFieldsToText();
+    bool bRet = GetDoc()->ConvertFieldsToText();
     EndAllAction();
     return bRet;
 }
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index ec521881dc10..a828a54d4dc2 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -438,7 +438,7 @@ static void GetFormatAndCreateCursorFromRangeRep(
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 // set cursor to top left box of range
-                SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( sal_False );
                 // #i80314#
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 304bed62167a..1eab4b606cc0 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -510,7 +510,7 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException)
     SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
     SwPosition aPos( *pTxtFtn->GetStartNode() );
     ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-        GetDoc()->CreateUnoCrsr(aPos, sal_False));
+        GetDoc()->CreateUnoCrsr(aPos, false));
     pUnoCursor->Move(fnMoveForward, fnGoNode);
     const uno::Reference< container::XEnumeration >  xRet =
         new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FOOTNOTE);
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index d419533f4b22..cb7fe6a7ca95 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -726,7 +726,7 @@ public:
             const enum CursorType eType,
             uno::Reference<text::XText> xParent,
             SwPosition const& rPoint, SwPosition const*const pMark)
-        : SwClient(rDoc.CreateUnoCrsr(rPoint, sal_False))
+        : SwClient(rDoc.CreateUnoCrsr(rPoint, false))
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
         , m_eType(eType)
         , m_xParentText(xParent)
@@ -2035,7 +2035,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
     SwPosition aStart = *rPaM.Start();
     SwPosition aEnd = *rPaM.End();
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr< SwUnoCrsr > pTemp ( rDoc.CreateUnoCrsr(aStart, sal_False) );
+    ::std::auto_ptr< SwUnoCrsr > pTemp ( rDoc.CreateUnoCrsr(aStart, false) );
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
     {
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index a1359bd80e50..c61eca6ade59 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -627,7 +627,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
         SwPosition* pStart = pUnoCrsr->Start();
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         const ::std::auto_ptr<SwUnoCrsr> aNewCrsr(
-            pUnoCrsr->GetDoc()->CreateUnoCrsr(*pStart, sal_False) );
+            pUnoCrsr->GetDoc()->CreateUnoCrsr(*pStart, false) );
         SAL_WNODEPRECATED_DECLARATIONS_POP
         // one may also go into tables here
         if ((CURSOR_TBLTEXT != m_eCursorType) &&
@@ -1184,7 +1184,7 @@ SwXTextRange::CreateXTextRange(
             ::sw::CreateParentXText(rDoc, rPos));
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwUnoCrsr> pNewCrsr(
-            rDoc.CreateUnoCrsr(rPos, sal_False));
+            rDoc.CreateUnoCrsr(rPos, false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if(pMark)
     {
@@ -1320,7 +1320,7 @@ throw (uno::RuntimeException)
     const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent());
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwUnoCrsr> pNewCrsr(
-            m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False));
+            m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if (!GetPositions(*pNewCrsr))
     {
@@ -1344,7 +1344,7 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException)
     const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent());
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwUnoCrsr> pNewCrsr(
-            m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False));
+            m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if (!GetPositions(*pNewCrsr))
     {
@@ -1751,7 +1751,7 @@ public:
     FrameDependList_t m_Frames;
 
     Impl(SwPaM const & rPaM)
-        : SwClient(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), sal_False))
+        : SwClient(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false))
     {
         if (rPaM.HasMark())
         {
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 64a267fe82f4..6e6ed92c04b8 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -1027,7 +1027,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
             SwPosition aStart( *aCursor.Start() );
             SwPosition aEnd  ( *aCursor.End()   );
             ::std::auto_ptr<SwUnoCrsr> pTemp(
-                aCursor.GetDoc()->CreateUnoCrsr(aStart, sal_False) );
+                aCursor.GetDoc()->CreateUnoCrsr(aStart, false) );
             if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
             {
                 pTemp->MovePara(fnParaCurr, fnParaStart);
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index a0246fb8da58..7c8897d1a285 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -255,7 +255,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
     : m_Portions()
 {
     SwUnoCrsr* pUnoCrsr =
-       rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), sal_False);
+       rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false);
     pUnoCrsr->Add(this);
 
     OSL_ENSURE(nEnd == -1 || (nStart <= nEnd &&
@@ -274,7 +274,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
     : m_Portions( rPortions )
 {
     SwUnoCrsr* const pUnoCrsr =
-       rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), sal_False);
+       rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false);
     pUnoCrsr->Add(this);
 }
 
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 8f399b235214..05b64ac49407 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -176,7 +176,7 @@ uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration(void)
     aPam.Move(fnMoveForward, fnGoNode);
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-        GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False));
+        GetDoc()->CreateUnoCrsr(*aPam.Start(), false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     return new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE);
 }
@@ -580,7 +580,7 @@ uno::Reference< container::XEnumeration >  SwXRedline::createEnumeration(void) t
         aPam.Move(fnMoveForward, fnGoNode);
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-            GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False));
+            GetDoc()->CreateUnoCrsr(*aPam.Start(), false));
         SAL_WNODEPRECATED_DECLARATIONS_POP
         xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE);
     }
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b3163b9d76d9..a9a4c3e70ccc 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1166,7 +1166,7 @@ uno::Reference< container::XEnumeration >  SwXCell::createEnumeration(void) thro
         const SwStartNode* pSttNd = pBox->GetSttNd();
         SwPosition aPos(*pSttNd);
         ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-            GetDoc()->CreateUnoCrsr(aPos, sal_False));
+            GetDoc()->CreateUnoCrsr(aPos, false));
         pUnoCursor->Move(fnMoveForward, fnGoNode);
 
         // remember table and start node for later travelling
@@ -1499,7 +1499,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) :
     SwDoc* pDoc = pFmt->GetDoc();
     const SwStartNode* pSttNd = pBox->GetSttNd();
     SwPosition aPos(*pSttNd);
-    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True);
+    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move( fnMoveForward, fnGoNode );
     pUnoCrsr->Add(&aCrsrDepend);
     SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
@@ -1511,7 +1511,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor*
     aCrsrDepend(this, 0),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR))
 {
-    SwUnoCrsr* pUnoCrsr = pTableSelection->GetDoc()->CreateUnoCrsr(*pTableSelection->GetPoint(), sal_True);
+    SwUnoCrsr* pUnoCrsr = pTableSelection->GetDoc()->CreateUnoCrsr(*pTableSelection->GetPoint(), true);
     if(pTableSelection->HasMark())
     {
         pUnoCrsr->SetMark();
@@ -2427,7 +2427,7 @@ uno::Reference< table::XCellRange >  SwXTextTable::GetRangeByName(SwFrmFmt* pFmt
         const SwStartNode* pSttNd = pTLBox->GetSttNd();
         SwPosition aPos(*pSttNd);
         // Cursor in die obere linke Zelle des Ranges setzen
-        SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+        SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
         pUnoCrsr->Move( fnMoveForward, fnGoNode );
         pUnoCrsr->SetRemainInSection( sal_False );
         const SwTableBox* pBRBox = pTable->GetTblBox( sBRName );
@@ -3111,7 +3111,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
                     const SwStartNode* pSttNd = pTLBox->GetSttNd();
                     SwPosition aPos(*pSttNd);
                     // set cursor to top left cell
-                    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True);
+                    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
                     pUnoCrsr->Move( fnMoveForward, fnGoNode );
                     pUnoCrsr->SetRemainInSection( sal_False );
 
@@ -3299,7 +3299,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
                     const SwStartNode* pSttNd = pTLBox->GetSttNd();
                     SwPosition aPos(*pSttNd);
                     // set cursor to top left cell
-                    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True);
+                    SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
                     pUnoCrsr->Move( fnMoveForward, fnGoNode );
                     pUnoCrsr->SetRemainInSection( sal_False );
 
@@ -3768,7 +3768,7 @@ uno::Reference< table::XCellRange >  SwXCellRange::getCellRangeByPosition(
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 // Cursor in die obere linke Zelle des Ranges setzen
-                SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( sal_False );
                 const SwTableBox* pBRBox = pTable->GetTblBox( sBRName );
@@ -4777,7 +4777,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
                 SwPosition aPos(*pSttNd);
                 // Cursor in die obere linke Zelle des Ranges setzen
                 UnoActionContext aAction(pFrmFmt->GetDoc());
-                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
 
                 {
@@ -4817,7 +4817,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 // Cursor in die obere linke Zelle des Ranges setzen
-                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( sal_False );
                 String sBLName = lcl_GetCellName(0, nIndex + nCount - 1);
@@ -4986,7 +4986,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 UnoActionContext aAction(pFrmFmt->GetDoc());
-                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
 
                 {
@@ -5026,7 +5026,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 // Cursor in die obere linke Zelle des Ranges setzen
-                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True);
+                SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( sal_False );
                 String sTRName = lcl_GetCellName(nIndex + nCount - 1, 0);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 3a3ba67cca5b..353384cce7ec 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2558,7 +2558,7 @@ throw (uno::RuntimeException)
     SwPosition aPos(rNode);
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-        GetDoc()->CreateUnoCrsr(aPos, sal_False));
+        GetDoc()->CreateUnoCrsr(aPos, false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     pUnoCursor->Move(fnMoveBackward, fnGoDoc);
     const uno::Reference< container::XEnumeration > xRet
@@ -2836,7 +2836,7 @@ throw (uno::RuntimeException)
     SwPosition aPos(rNode);
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
-        GetDoc()->CreateUnoCrsr(aPos, sal_False));
+        GetDoc()->CreateUnoCrsr(aPos, false));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     pUnoCursor->Move(fnMoveForward, fnGoNode);
     aRef = new SwXParagraphEnumeration(this, pUnoCursor,
diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx
index 29b63defbaa2..f1ff4cb73780 100644
--- a/sw/source/ui/inc/navmgr.hxx
+++ b/sw/source/ui/inc/navmgr.hxx
@@ -63,9 +63,9 @@ public:
     /* Constructor that initializes the shell to the current shell */
     SwNavigationMgr( SwWrtShell & rShell );
     /* Can we go back in the history ? */
-    sal_Bool backEnabled() ;
+    bool backEnabled() ;
     /* Can we go forward in the history ? */
-    sal_Bool forwardEnabled();
+    bool forwardEnabled();
     /* The method that is called when we click the back button */
     void goBack() ;
     /* The method that is called when we click the forward button */
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index 66a53f14b5cf..862726119d71 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -82,7 +82,7 @@ SwNavigationMgr::SwNavigationMgr(SwWrtShell & rShell)
  * It is called when we want to check if the back button should be enabled or not.
  * The back button should be enabled only if there are some entries in the navigation history
  */
-sal_Bool SwNavigationMgr::backEnabled() {
+bool SwNavigationMgr::backEnabled() {
     return (m_nCurrent > 0);
 }
 /*
@@ -92,7 +92,7 @@ sal_Bool SwNavigationMgr::backEnabled() {
  * current position within the navigation history entries in not the last one
  * i.e. when the m_nCurrent index is not at the end of the m_entries vector
  */
-sal_Bool SwNavigationMgr::forwardEnabled() {
+bool SwNavigationMgr::forwardEnabled() {
     return m_nCurrent+1 < m_entries.size();
 }