sal_Bool to bool

Change-Id: I5a29ca056af443643bfef823d0a064c5d834d24f

sw/source/ui/app/apphdl.cxx

@@ -687,9 +687,9 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                 if( pWrtSh )
                 {
                     SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
-                    sal_Bool bUpdateFields = sal_True;
+                    bool bUpdateFields = true;
                     if( pUpdateDocItem &&  pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE)
-                        bUpdateFields = sal_False;
+                        bUpdateFields = false;
                     if(bUpdateFields)
                     {
                         pWrtSh->UpdateInputFlds();
@@ -768,11 +768,11 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
     }
     else if ( pBrdCst == pColorConfig || pBrdCst == pAccessibilityOptions )
     {
-        sal_Bool bAccessibility = sal_False;
+        bool bAccessibility = false;
         if( pBrdCst == pColorConfig )
             SwViewOption::ApplyColorConfigValues(*pColorConfig);
         else
-            bAccessibility = sal_True;
+            bAccessibility = true;
 
         //invalidate all edit windows
         const TypeId aSwViewTypeId = TYPE(SwView);

sw/source/ui/app/appopt.cxx

@@ -74,7 +74,7 @@ using namespace ::com::sun::star::lang;
 
 SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
 {
-    sal_Bool bTextDialog = (nId == SID_SW_EDITOPTIONS) ? sal_True : sal_False;
+    bool bTextDialog = (nId == SID_SW_EDITOPTIONS);
 
     // the options for the Web- and Textdialog are put together here
         SwViewOption aViewOpt = *GetUsrPref(!bTextDialog);
@@ -86,7 +86,7 @@ SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
         if(pAppView)
         {
         // if Text then no WebView and vice versa
-            sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pAppView);
+            bool bWebView = 0 != PTR_CAST(SwWebView, pAppView);
             if( (bWebView &&  !bTextDialog) ||(!bWebView &&  bTextDialog))
             {
                 aViewOpt = *pAppView->GetWrtShell().GetViewOptions();
@@ -241,14 +241,14 @@ SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
 
 void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
 {
-    sal_Bool bTextDialog = nId == SID_SW_EDITOPTIONS;
+    bool bTextDialog = nId == SID_SW_EDITOPTIONS;
     SwView* pAppView = GetView();
     if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current())
         pAppView = 0;
     if(pAppView)
     {
         // the text dialog mustn't apply data to the web view and vice versa
-        sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pAppView);
+        bool bWebView = 0 != PTR_CAST(SwWebView, pAppView);
         if(bWebView == bTextDialog)
             pAppView = 0;
     }
@@ -499,7 +499,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI
             if(pCurrView)
             {
                 // if text then not WebView and vice versa
-                sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pCurrView);
+                bool bWebView = 0 != PTR_CAST(SwWebView, pCurrView);
                 if( (bWebView &&  RID_SW_TP_HTML_OPTTABLE_PAGE == nId) ||
                     (!bWebView &&  RID_SW_TP_HTML_OPTTABLE_PAGE != nId) )
                 {

sw/source/ui/app/docsh2.cxx

@@ -120,7 +120,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 using namespace ::sfx2;
-extern sal_Bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
+extern bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
 
 /*--------------------------------------------------------------------
     Description:    create DocInfo (virtual)
@@ -691,7 +691,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
         case SID_PRINTPREVIEW:
             {
-                sal_Bool bSet = sal_False, bFound = sal_False, bOnly = sal_True;
+                sal_Bool bSet = sal_False;
+                bool bFound = false, bOnly = true;
                 SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this);
                 SfxViewShell* pViewShell = SfxViewShell::Current();
                 SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell );
@@ -700,11 +701,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 while( pTmpFrm )    // search PreView
                 {
                     if( IS_TYPE( SwView, pTmpFrm->GetViewShell()) )
-                        bOnly = sal_False;
+                        bOnly = false;
                     else if( IS_TYPE( SwPagePreView, pTmpFrm->GetViewShell()))
                     {
                         pTmpFrm->GetFrame().Appear();
-                        bFound = sal_True;
+                        bFound = true;
                     }
                     if( bFound && !bOnly )
                         break;
@@ -806,7 +807,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             }
                             pFlt = aIter.Next();
                         }
-                        sal_Bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this );
+                        bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this );
                         const SfxFilter *pOwnFlt =
                                 SwDocShell::Factory().GetFilterContainer()->
                                 GetFilter4FilterName(rtl::OUString("writer8"));
@@ -918,7 +919,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
                 // the SourceView is not the 1 for SwWebDocShell
                 sal_uInt16 nSlot = SID_VIEWSHELL1;
-                sal_Bool bSetModified = sal_False;
+                bool bSetModified = false;
                 SfxPrinter* pSavePrinter = 0;
                 if( 0 != pSrcView)
                 {
@@ -1146,9 +1147,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
         case FN_NEW_GLOBAL_DOC:
             {
                 bDone = sal_False;
-                sal_Bool bCreateHtml = FN_NEW_HTML_DOC == nWhich;
+                bool bCreateHtml = FN_NEW_HTML_DOC == nWhich;
 
-                sal_Bool bCreateByOutlineLevel = false;     //#outline level,add by zhaojianwei
+                bool bCreateByOutlineLevel = false;     //#outline level,add by zhaojianwei
                 sal_Int32  nTemplateOutlineLevel = 0 ;      //#outline level,add by zhaojianwei
 
                 String aFileName, aTemplateName;

sw/source/ui/app/docst.cxx

@@ -961,10 +961,10 @@ sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
 
     SwEditWin& rEdtWin = pView->GetEditWin();
     SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
-    sal_Bool bWaterCan = !(pApply && pApply->eType != 0);
+    bool bWaterCan = !(pApply && pApply->eType != 0);
 
     if( !rName.Len() )
-        bWaterCan = sal_False;
+        bWaterCan = false;
 
     SwApplyTemplate aTemplate;
     aTemplate.eType = nFamily;