Kaydet (Commit) e2d76d28 authored tarafından Takeshi Abe's avatar Takeshi Abe

sal_Bool to bool

Change-Id: I6997b288f444c7f0a982e88a9549569ed816493e
üst 604936e0
...@@ -293,7 +293,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton ...@@ -293,7 +293,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
} }
else else
{ {
sal_Bool bNext = pButton == &m_aNextSetIB; bool bNext = pButton == &m_aNextSetIB;
sal_Int32 nPos = rConfig.GetResultSetPosition(); sal_Int32 nPos = rConfig.GetResultSetPosition();
rConfig.MoveResultSet( bNext ? ++nPos : --nPos); rConfig.MoveResultSet( bNext ? ++nPos : --nPos);
} }
...@@ -504,12 +504,12 @@ SwRestrictedComboBox::~SwRestrictedComboBox() ...@@ -504,12 +504,12 @@ SwRestrictedComboBox::~SwRestrictedComboBox()
void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt) void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
{ {
sal_Bool bCallParent = sal_True; bool bCallParent = true;
if(rEvt.GetCharCode()) if(rEvt.GetCharCode())
{ {
rtl::OUString sKey(rEvt.GetCharCode()); rtl::OUString sKey(rEvt.GetCharCode());
if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
bCallParent = sal_False; bCallParent = false;
} }
if(bCallParent) if(bCallParent)
ComboBox::KeyInput(rEvt); ComboBox::KeyInput(rEvt);
......
...@@ -1265,7 +1265,7 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData, ...@@ -1265,7 +1265,7 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
const Sequence< ::rtl::OUString>& rList) const Sequence< ::rtl::OUString>& rList)
{ {
::std::vector<DBAddressDataAssignment>::iterator aAssignIter; ::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
sal_Bool bFound = sal_False; bool bFound = false;
for(aAssignIter = m_pImpl->aAddressDataAssignments.begin(); for(aAssignIter = m_pImpl->aAddressDataAssignments.begin();
aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter) aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter)
{ {
...@@ -1276,7 +1276,7 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData, ...@@ -1276,7 +1276,7 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
aAssignIter->aDBColumnAssignments = rList; aAssignIter->aDBColumnAssignments = rList;
aAssignIter->bColumnAssignmentsChanged = true; aAssignIter->bColumnAssignmentsChanged = true;
} }
bFound = sal_True; bFound = true;
break; break;
} }
} }
......
...@@ -412,7 +412,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) ...@@ -412,7 +412,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
} }
else else
{ {
sal_Bool bNext = pButton == &m_aNextSetIB; bool bNext = pButton == &m_aNextSetIB;
sal_Int32 nPos = rConfig.GetResultSetPosition(); sal_Int32 nPos = rConfig.GetResultSetPosition();
rConfig.MoveResultSet( bNext ? ++nPos : --nPos); rConfig.MoveResultSet( bNext ? ++nPos : --nPos);
} }
......
...@@ -105,13 +105,13 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, ...@@ -105,13 +105,13 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aBuffer[ nBytesRead+1 ] = '0'; aBuffer[ nBytesRead+1 ] = '0';
} }
sal_Bool bCR = sal_False, bLF = sal_False, bNullChar = sal_False; bool bCR = false, bLF = false, bNullChar = false;
for( sal_uInt16 nCnt = 0; nCnt < nBytesRead; ++nCnt ) for( sal_uInt16 nCnt = 0; nCnt < nBytesRead; ++nCnt )
switch( aBuffer[ nCnt ] ) switch( aBuffer[ nCnt ] )
{ {
case 0x0: bNullChar = sal_True; break; case 0x0: bNullChar = true; break;
case 0xA: bLF = sal_True; break; case 0xA: bLF = true; break;
case 0xD: bCR = sal_True; break; case 0xD: bCR = true; break;
case 0xC: case 0xC:
case 0x1A: case 0x1A:
case 0x9: break; case 0x9: break;
......
...@@ -46,7 +46,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) ...@@ -46,7 +46,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
SfxEventNamesItem aItem(SID_EVENTCONFIG); SfxEventNamesItem aItem(SID_EVENTCONFIG);
sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
sal_Bool bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; bool bHtmlMode = nHtmlMode & HTMLMODE_ON;
switch( eType ) switch( eType )
{ {
......
...@@ -610,10 +610,10 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) ...@@ -610,10 +610,10 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
bool bHidden = true; bool bHidden = true;
bool bProtect = true; bool bProtect = true;
String sCondition; String sCondition;
sal_Bool bFirst = sal_True; bool bFirst = true;
sal_Bool bFileValid = sal_True; bool bFileValid = true;
sal_Bool bFile = sal_True; bool bFile = true;
sal_Bool bPasswdValid = sal_True; bool bPasswdValid = true;
while( pEntry ) while( pEntry )
{ {
...@@ -646,7 +646,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) ...@@ -646,7 +646,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
bPasswdValid = (aCurPasswd == rData.GetPassword()); bPasswdValid = (aCurPasswd == rData.GetPassword());
} }
pEntry = pBox->NextSelected(pEntry); pEntry = pBox->NextSelected(pEntry);
bFirst = sal_False; bFirst = false;
} }
aHideCB.SetState( !bHiddenValid ? STATE_DONTKNOW : aHideCB.SetState( !bHiddenValid ? STATE_DONTKNOW :
...@@ -956,14 +956,14 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) ...@@ -956,14 +956,14 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
{ {
const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
SvTreeListEntry* pRemove = 0; SvTreeListEntry* pRemove = 0;
sal_Bool bRestart = sal_False; bool bRestart = false;
if(pSectRepr->IsSelected()) if(pSectRepr->IsSelected())
{ {
aSectReprArr.insert( pSectRepr ); aSectReprArr.insert( pSectRepr );
while( (pChild = aTree.FirstChild(pEntry) )!= 0 ) while( (pChild = aTree.FirstChild(pEntry) )!= 0 )
{ {
// because of the repositioning we have to start at the beginning again // because of the repositioning we have to start at the beginning again
bRestart = sal_True; bRestart = true;
pParent=aTree.GetParent(pEntry); pParent=aTree.GetParent(pEntry);
aTree.GetModel()->Move(pChild, pParent, aTree.GetModel()->GetRelPos(pEntry)); aTree.GetModel()->Move(pChild, pParent, aTree.GetModel()->GetRelPos(pEntry));
} }
...@@ -1292,7 +1292,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) ...@@ -1292,7 +1292,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
{ {
sal_Bool bChange = pBox == &aPasswdPB; bool bChange = pBox == &aPasswdPB;
if(!CheckPasswd(0)) if(!CheckPasswd(0))
{ {
if(!bChange) if(!bChange)
...@@ -1300,7 +1300,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) ...@@ -1300,7 +1300,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
return 0; return 0;
} }
SvTreeListEntry* pEntry=aTree.FirstSelected(); SvTreeListEntry* pEntry=aTree.FirstSelected();
sal_Bool bSet = bChange ? bChange : aPasswdCB.IsChecked(); bool bSet = bChange ? bChange : aPasswdCB.IsChecked();
OSL_ENSURE(pEntry,"no entry found"); OSL_ENSURE(pEntry,"no entry found");
while( pEntry ) while( pEntry )
{ {
...@@ -1492,7 +1492,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog( ...@@ -1492,7 +1492,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = rHtmlOpt.GetExportMode(); long nHtmlMode = rHtmlOpt.GetExportMode();
sal_Bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() ); bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
if(bWeb) if(bWeb)
{ {
RemoveTabPage(TP_SECTION_FTNENDNOTES); RemoveTabPage(TP_SECTION_FTNENDNOTES);
...@@ -1631,7 +1631,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) ...@@ -1631,7 +1631,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
{ {
m_pWrtSh = &rSh; m_pWrtSh = &rSh;
sal_Bool bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell()); bool bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell());
if(bWeb) if(bWeb)
{ {
aHideCB .Hide(); aHideCB .Hide();
...@@ -2171,7 +2171,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( ...@@ -2171,7 +2171,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = rHtmlOpt.GetExportMode(); long nHtmlMode = rHtmlOpt.GetExportMode();
sal_Bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() ); bool bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
if(bWeb) if(bWeb)
{ {
RemoveTabPage(TP_SECTION_FTNENDNOTES); RemoveTabPage(TP_SECTION_FTNENDNOTES);
......
...@@ -116,7 +116,7 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw ...@@ -116,7 +116,7 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw
} }
if(pCurGrp) if(pCurGrp)
{ {
sal_Bool bPathEqual = sal_False; bool bPathEqual = false;
if(!bAlwaysCreateNew) if(!bAlwaysCreateNew)
{ {
INetURLObject aTemp( pCurGrp->GetFileName() ); INetURLObject aTemp( pCurGrp->GetFileName() );
...@@ -138,7 +138,7 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw ...@@ -138,7 +138,7 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw
sal_uInt16 nComparePath = (sal_uInt16)sPath.ToInt32(); sal_uInt16 nComparePath = (sal_uInt16)sPath.ToInt32();
if(nCurrentPath == nComparePath && if(nCurrentPath == nComparePath &&
sGroup.GetToken(0, GLOS_DELIM) == sCurBase) sGroup.GetToken(0, GLOS_DELIM) == sCurBase)
bPathEqual = sal_True; bPathEqual = true;
} }
// When path changed, the name is not reliable // When path changed, the name is not reliable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment