sal_Bool to bool

Change-Id: I27471e2331ff4813850fc5d3ca398ae6e1d86758

sw/source/ui/docvw/edtwin2.cxx

@@ -100,10 +100,10 @@ static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, sal_Bool b
 void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
-    sal_Bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
+    bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
     if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips())
         return;
-    sal_Bool bWeiter = sal_True;
+    bool bWeiter = true;
     SET_CURR_SHELL(&rSh);
     String sTxt;
     Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) ));
@@ -380,7 +380,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 }
             }
 
-            bWeiter = sal_False;
+            bWeiter = false;
         }
         if( bWeiter )
         {
@@ -419,7 +419,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize);
                 Help::ShowQuickHelp(this, aRect, sTxt);
             }
-            bWeiter = sal_False;
+            bWeiter = false;
         }
     }
 
@@ -438,7 +438,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 pObj = aVEvt.pObj;
                 sTxt = pField->GetURL();
 
-                bWeiter = sal_False;
+                bWeiter = false;
             }
         }
         if (bWeiter && eHit == SDRHIT_TEXTEDIT)
@@ -463,7 +463,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 if (pField )
                 {
                     sTxt = ((const SvxURLField*) pField)->GetURL();
-                    bWeiter = sal_False;
+                    bWeiter = false;
                 }
             }
         }
@@ -502,7 +502,7 @@ void  SwEditWin::Paint(const Rectangle& rRect)
     SwWrtShell* pWrtShell = GetView().GetWrtShellPtr();
     if(!pWrtShell)
         return;
-    sal_Bool bPaintShadowCrsr = sal_False;
+    bool bPaintShadowCrsr = false;
     if( pShadCrsr )
     {
         Rectangle aRect( pShadCrsr->GetRect());
@@ -515,7 +515,7 @@ void  SwEditWin::Paint(const Rectangle& rRect)
             // resides somewhat above, then everything is clipped outside
             // and we have to make the "inner part" at the end of the
             // Paint visible again. Otherwise Paint errors occur!
-            bPaintShadowCrsr = sal_True;
+            bPaintShadowCrsr = true;
         }
     }
 

sw/source/ui/docvw/frmsidebarwincontainer.cxx

@@ -42,7 +42,7 @@ namespace {
 
     struct SidebarWinOrder
     {
-        sal_Bool operator()( const SidebarWinKey& rSidebarWinKeyA,
+        bool operator()( const SidebarWinKey& rSidebarWinKeyA,
                              const SidebarWinKey& rSidebarWinKeyB ) const
         {
             return rSidebarWinKeyA < rSidebarWinKeyB;
@@ -67,7 +67,7 @@ namespace {
 
     struct FrmOrder
     {
-        sal_Bool operator()( const FrmKey& rFrmKeyA,
+        bool operator()( const FrmKey& rFrmKeyA,
                              const FrmKey& rFrmKeyB ) const
         {
             return rFrmKeyA < rFrmKeyB;

sw/source/ui/docvw/srcedtw.cxx

@@ -163,18 +163,18 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
             // now we still have to look for '>'
             if(svtools::HTMLUNKNOWN != eFoundType)
             {
-                sal_Bool bFound = sal_False;
+                bool bFound = false;
                 for(sal_uInt16 i = nPortEnd; i < nStrLen; i++)
                     if(cCloseBracket == rSource.GetChar(i))
                     {
-                        bFound = sal_True;
+                        bFound = true;
                         nPortEnd = i;
                         break;
                     }
                 if(!bFound && (eFoundType == svtools::HTMLCOMMENT))
                 {
                     // comment without ending in this line
-                    bFound  = sal_True;
+                    bFound  = true;
                     nPortEnd = nStrLen - 1;
                 }
 
@@ -439,7 +439,7 @@ void  TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
 {
     sal_Bool bDone = sal_False;
     SwSrcEditWindow* pSrcEditWin = (SwSrcEditWindow*)GetParent();
-    sal_Bool bChange = !pSrcEditWin->IsReadonly() || !TextEngine::DoesKeyChangeText( rKEvt );
+    bool bChange = !pSrcEditWin->IsReadonly() || !TextEngine::DoesKeyChangeText( rKEvt );
     if(bChange)
         bDone = pTextView->KeyInput( rKEvt );
 
@@ -787,7 +787,7 @@ void SwSrcEditWindow::GetFocus()
     pOutWin->GrabFocus();
 }
 
-static sal_Bool  lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[])
+static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[])
 {
     switch(eEnc)
     {

sw/source/ui/envelp/envfmt.cxx

@@ -207,14 +207,14 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
                    aEntryName;
 
             sal_uInt16 nPos   = 0;
-            sal_Bool   bFound = sal_False;
+            bool bFound = false;
             while (nPos < aSizeFormatBox.GetEntryCount() && !bFound)
             {
                 aEntryName = aSizeFormatBox.GetEntry(i);
                 if (aEntryName < aPaperName)
                     nPos++;
                 else
-                    bFound = sal_True;
+                    bFound = true;
             }
             aSizeFormatBox.InsertEntry(aPaperName, nPos);
             aIDs.insert( aIDs.begin() + nPos, (sal_uInt16) i);
@@ -273,7 +273,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
     OSL_ENSURE(pSh, "Shell missing");
 
     // determine collection-ptr
-    sal_Bool bSender = pButton != &aAddrEditButton;
+    bool bSender = pButton != &aAddrEditButton;
 
     SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool( static_cast< sal_uInt16 >(
         bSender ? RES_POOLCOLL_SENDADRESS : RES_POOLCOLL_JAKETADRESS));
@@ -387,7 +387,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
   Description: A temporary Itemset that gets discarded at abort
 ------------------------------------------------------------------------*/
 
-SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender)
+SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, bool bSender)
 {
     SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet;
 

sw/source/ui/envelp/envfmt.hxx

@@ -69,7 +69,7 @@ class SwEnvFmtPage : public SfxTabPage
 
     void SetMinMax();
 
-    SfxItemSet  *GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender);
+    SfxItemSet  *GetCollItemSet(SwTxtFmtColl* pColl, bool bSender);
 
     SwEnvDlg    *GetParentSwEnvDlg() {return (SwEnvDlg*) GetParentDialog();}
 

sw/source/ui/envelp/envimg.cxx

@@ -56,7 +56,7 @@ SW_DLLPUBLIC String MakeSender()
     String sRet;
     String sSenderToken(SW_RES(STR_SENDER_TOKENS));
     xub_StrLen nSttPos = 0, nTokenCount = comphelper::string::getTokenCount(sSenderToken, ';');
-    sal_Bool bLastLength = sal_True;
+    bool bLastLength = true;
     for( xub_StrLen i = 0; i < nTokenCount; i++ )
     {
         String sToken = sSenderToken.GetToken( 0, ';', nSttPos );
@@ -70,7 +70,7 @@ SW_DLLPUBLIC String MakeSender()
         {
             if(bLastLength)
                 sRet +=NEXTLINE;
-            bLastLength = sal_True;
+            bLastLength = true;
         }
         else if(sToken.EqualsAscii("FIRSTNAME"))
             sRet += (String)rUserOpt.GetFirstName();
@@ -300,7 +300,7 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
 
 bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
-    sal_Bool bRet = true;
+    bool bRet = true;
     switch(nMemberId & ~CONVERT_TWIPS)
     {
         case MID_ENV_ADDR_TEXT : rVal <<= aAddrText; break;

sw/source/ui/envelp/label1.cxx

@@ -137,14 +137,14 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
     pRec->aMake   = pRec->aType = aTmp;
     pRec->SetFromItem( aItem );
 
-    sal_Bool bDouble = sal_False;
+    bool bDouble = false;
 
     for (sal_uInt16 nRecPos = 0; nRecPos < pRecs->size(); nRecPos++)
     {
         if (pRec->aMake == (*pRecs)[nRecPos]->aMake &&
             pRec->aType == (*pRecs)[nRecPos]->aType)
         {
-            bDouble = sal_True;
+            bDouble = true;
             break;
         }
     }
@@ -198,7 +198,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
 SwLabRec* SwLabDlg::GetRecord(const String &rRecName, sal_Bool bCont)
 {
     SwLabRec* pRec = NULL;
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     String sCustom(SW_RES(STR_CUSTOM));
 
     const sal_uInt16 nCount = Recs().size();
@@ -208,7 +208,7 @@ SwLabRec* SwLabDlg::GetRecord(const String &rRecName, sal_Bool bCont)
         if (pRec->aType != sCustom &&
             rRecName == pRec->aType && bCont == pRec->bCont)
         {
-            bFound = sal_True;
+            bFound = true;
             break;
         }
     }
@@ -412,17 +412,17 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         const String aType ( GetParentSwLabDlg()->Recs()[i]->aType );
-        sal_Bool bInsert = sal_False;
+        bool bInsert = false;
         if ( GetParentSwLabDlg()->Recs()[i]->aType == sCustom )
         {
-            bInsert = sal_True;
+            bInsert = true;
             aTypeBox.InsertEntry(aType );
         }
         else if ( GetParentSwLabDlg()->Recs()[i]->bCont == bCont )
         {
             if ( aHiddenSortTypeBox.GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND )
             {
-                bInsert = sal_True;
+                bInsert = true;
                 aHiddenSortTypeBox.InsertEntry( aType );
             }
         }
@@ -703,7 +703,7 @@ static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName
     }
 }
 
-static sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
+static bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
 {
     SvTreeListEntry* pEntry = rAutoTextLB.First();
     while(pEntry)
@@ -711,24 +711,24 @@ static sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockNa
         if(*(String*)pEntry->GetUserData() == rBlockName)
         {
             rAutoTextLB.Select(pEntry);
-            return sal_True;
+            return true;
         }
         pEntry = rAutoTextLB.Next(pEntry);
     }
-    return sal_False;
+    return false;
 }
 
 void SwVisitingCardPage::Reset(const SfxItemSet& rSet)
 {
     aLabItem = (const SwLabItem&) rSet.Get(FN_LABEL);
 
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     sal_uInt16 i;
     for(i = 0; i < aAutoTextGroupLB.GetEntryCount() && !bFound; i++)
         if( String(aLabItem.sGlossaryGroup) ==
             *(String*)aAutoTextGroupLB.GetEntryData( i ))
         {
-            bFound = sal_True;
+            bFound = true;
             break;
         }
 
@@ -739,7 +739,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet& rSet)
         for(i = 0; i < aAutoTextGroupLB.GetEntryCount() && !bFound; i++)
             if(0 == (*(String*)aAutoTextGroupLB.GetEntryData( i )).SearchAscii( "crd") )
             {
-                bFound = sal_True;
+                bFound = true;
                 break;
             }
     }

sw/source/ui/envelp/labelcfg.cxx

@@ -173,11 +173,11 @@ void    SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab
 sal_Bool    SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
 {
     const OUString* pNode = aNodeNames.getConstArray();
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength() && !bFound; nNode++)
     {
         if(pNode[nNode] == rManufacturer)
-            bFound = sal_True;
+            bFound = true;
     }
     if(bFound)
     {
@@ -207,24 +207,24 @@ sal_Bool    SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rt
     return sal_False;
 }
 
-static sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
+static bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
 {
     const OUString* pLabels = rLabels.getConstArray();
     for(sal_Int32 i = 0; i < rLabels.getLength(); i++)
         if(pLabels[i] == rNode)
-            return sal_True;
-    return sal_False;
+            return true;
+    return false;
 }
 
 void SwLabelConfig::SaveLabel(  const rtl::OUString& rManufacturer,
         const rtl::OUString& rType, const SwLabRec& rRec)
 {
     const OUString* pNode = aNodeNames.getConstArray();
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength() && !bFound; nNode++)
     {
         if(pNode[nNode] == rManufacturer)
-            bFound = sal_True;
+            bFound = true;
     }
     if(!bFound)
     {

sw/source/ui/envelp/labfmt.cxx

@@ -173,15 +173,15 @@ void SwLabPreview::Paint(const Rectangle &)
     if (aItem.lLeft)
     {
         long lX = (lX0 + lX1) / 2;
-        DrawArrow(Point(lX0, lY0 - 5), Point(lX1, lY0 - 5), sal_False);
-        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), sal_True);
+        DrawArrow(Point(lX0, lY0 - 5), Point(lX1, lY0 - 5), false);
+        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), true);
         DrawText(Point(lX1 - lLeftWidth, lY0 - 10 - lXHeight), aLeftStr);
     }
 
     // annotation: upper border
     if (aItem.lUpper)
     {
-        DrawArrow(Point(lX0 - 5, lY0), Point(lX0 - 5, lY1), sal_False);
+        DrawArrow(Point(lX0 - 5, lY0), Point(lX0 - 5, lY1), false);
         DrawText(Point(lX0 - 10 - lUpperWidth, ROUND(lY0 + f * aItem.lUpper / 2 - lXHeight / 2)), aUpperStr);
     }
 
@@ -201,36 +201,36 @@ void SwLabPreview::Paint(const Rectangle &)
     if (aItem.nCols > 1)
     {
         long lX = (lX1 + lX3) / 2;
-        DrawArrow(Point(lX1, lY0 - 5), Point(lX3, lY0 - 5), sal_False);
-        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), sal_True);
+        DrawArrow(Point(lX1, lY0 - 5), Point(lX3, lY0 - 5), false);
+        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), true);
         DrawText(Point(lX - lHDistWidth / 2, lY0 - 10 - lXHeight), aHDistStr);
     }
 
     // annotation: vertical gap
     if (aItem.nRows > 1)
     {
-        DrawArrow(Point(lX0 - 5, lY1), Point(lX0 - 5, lY3), sal_False);
+        DrawArrow(Point(lX0 - 5, lY1), Point(lX0 - 5, lY3), false);
         DrawText(Point(lX0 - 10 - lVDistWidth, ROUND(lY1 + f * aItem.lVDist / 2 - lXHeight / 2)), aVDistStr);
     }
 
     // annotation: columns
     {
         long lY = lY0 + lOutlineH + 4;
-        DrawArrow(Point(lX0, lY), Point(lX0 + lOutlineW - 1, lY), sal_True);
+        DrawArrow(Point(lX0, lY), Point(lX0 + lOutlineW - 1, lY), true);
         DrawText(Point((lX0 + lX0 + lOutlineW - 1) / 2 - lColsWidth / 2, lY + 5), aColsStr);
     }
 
     // annotation: lines
     {
         long lX = lX0 + lOutlineW + 4;
-        DrawArrow(Point(lX, lY0), Point(lX, lY0 + lOutlineH - 1), sal_True);
+        DrawArrow(Point(lX, lY0), Point(lX, lY0 + lOutlineH - 1), true);
         DrawText(Point(lX + 5, (lY0 + lY0 + lOutlineH - 1 - lXHeight / 2) / 2), aRowsStr);
     }
 }
 
 // Arror or interval character --------------------------------------------
 
-void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, sal_Bool bArrow)
+void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, bool bArrow)
 {
     DrawLine(rP1, rP2);
 
@@ -315,7 +315,7 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aPHeightText  (this, SW_RES(TXT_PHEIGHT )),
     aPHeightField (this, SW_RES(FLD_PHEIGHT )),
     aSavePB      (this, SW_RES(PB_SAVE  )),
-    bModified(sal_False),
+    bModified(false),
     aItem        ((const SwLabItem&) rSet.Get(FN_LABEL))
 {
     FreeResource();
@@ -370,7 +370,7 @@ SwLabFmtPage::~SwLabFmtPage()
 // Modify-handler of MetricFields. start preview timer
 IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, ModifyHdl)
 {
-    bModified = sal_True;
+    bModified = true;
     aPreviewTimer.Start();
     return 0;
 }
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
     pSaveDlg->Execute();
     if(pSaveDlg->GetLabel(aItem))
     {
-        bModified = sal_False;
+        bModified = false;
         const Sequence<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
         std::vector<rtl::OUString>& rMakes(GetParentSwLabDlg()->Makes());
         if(rMakes.size() < (sal_uInt16)rMan.getLength())
@@ -606,7 +606,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) :
 
     aQueryMB(this,  SW_RES(MB_QUERY )),
 
-    bSuccess(sal_False),
+    bSuccess(false),
     pLabPage(pParent),
     rLabRec(rRec)
 {
@@ -644,7 +644,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
     }
     rLabRec.aType = sType;
     rCfg.SaveLabel(sMake, sType, rLabRec);
-    bSuccess = sal_True;
+    bSuccess = true;
     EndDialog(RET_OK);
     return 0;
 }
@@ -655,7 +655,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyHdl)
     return 0;
 }
 
-sal_Bool SwSaveLabelDlg::GetLabel(SwLabItem& rItem)
+bool SwSaveLabelDlg::GetLabel(SwLabItem& rItem)
 {
     if(bSuccess)
     {

sw/source/ui/envelp/labfmt.hxx

@@ -62,7 +62,7 @@ class SwLabPreview : public Window
 
     void Paint(const Rectangle&);
 
-    void DrawArrow(const Point& rP1, const Point& rP2, sal_Bool bArrow);
+    void DrawArrow(const Point& rP1, const Point& rP2, bool bArrow);
 
     using Window::GetParent;
     SwLabFmtPage* GetParent() {return (SwLabFmtPage*) Window::GetParent();}
@@ -107,7 +107,7 @@ class SwLabFmtPage : public SfxTabPage
     PushButton   aSavePB;
 
     Timer aPreviewTimer;
-    sal_Bool  bModified;
+    bool  bModified;
 
     SwLabItem    aItem;
 
@@ -151,7 +151,7 @@ class SwSaveLabelDlg : public ModalDialog
 
     QueryBox        aQueryMB;
 
-    sal_Bool        bSuccess;
+    bool        bSuccess;
     SwLabFmtPage*   pLabPage;
     SwLabRec&       rLabRec;
 
@@ -166,7 +166,7 @@ public:
             aMakeCB.SetText(String(rMake));
             aTypeED.SetText(String(rType));
         }
-    sal_Bool GetLabel(SwLabItem& rItem);
+    bool GetLabel(SwLabItem& rItem);
 };
 #endif
 

sw/source/ui/envelp/labimg.cxx

@@ -275,7 +275,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
     EnableNotification(aNames);
     const Any* pValues = aValues.getConstArray();
     OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed");
-    sal_Bool bNoConfigValues = sal_True;
+    bool bNoConfigValues = true;
     if(aValues.getLength() == aNames.getLength())
     {
         for(int nProp = 0, nProperty = 0; nProp < aNames.getLength(); nProp++, nProperty++)
@@ -287,7 +287,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
                 if(nProp == 17 && !bIsLabel)
                     nProperty += 3;
                 if(nProperty >= 20)
-                    bNoConfigValues = sal_False;
+                    bNoConfigValues = false;
                 switch(nProperty)
                 {
                     case  0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous",

sw/source/ui/envelp/mailmrge.cxx

@@ -344,7 +344,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
 
     aLk = LINK(this, SwMailMergeDlg, FilenameHdl);
     aGenerateFromDataBaseCB.SetClickHdl( aLk );
-    sal_Bool bColumn = pModOpt->IsNameFromColumn();
+    bool bColumn = pModOpt->IsNameFromColumn();
     if(bColumn)
         aGenerateFromDataBaseCB.Check();