[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 24 17:45:10 PST 2013
sw/inc/swabstdlg.hxx | 2 -
sw/source/ui/config/optload.cxx | 2 -
sw/source/ui/dialog/swdlgfact.cxx | 2 -
sw/source/ui/dialog/swdlgfact.hxx | 2 -
sw/source/ui/fldui/flddb.cxx | 2 -
sw/source/ui/fldui/flddinf.cxx | 2 -
sw/source/ui/fldui/flddok.cxx | 12 +++----
sw/source/ui/fldui/fldfunc.cxx | 2 -
sw/source/ui/fldui/fldmgr.cxx | 64 +++++++++++++++++++-------------------
sw/source/ui/fldui/fldpage.cxx | 4 +-
sw/source/ui/fldui/fldpage.hxx | 4 +-
sw/source/ui/fldui/fldref.cxx | 2 -
sw/source/ui/fldui/fldtdlg.cxx | 2 -
sw/source/ui/fldui/fldvar.cxx | 8 ++--
sw/source/ui/fldui/fldvar.hxx | 6 +--
sw/source/ui/fldui/inpdlg.cxx | 8 ++--
sw/source/ui/fldui/javaedit.cxx | 2 -
sw/source/ui/frmdlg/cption.cxx | 2 -
sw/source/ui/inc/fldmgr.hxx | 8 ++--
sw/source/ui/inc/javaedit.hxx | 2 -
sw/source/ui/shells/textfld.cxx | 13 ++++---
21 files changed, 76 insertions(+), 75 deletions(-)
New commits:
commit 17deff0c9a066ab4208747062577ab700dac60ef
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jan 25 10:43:17 2013 +0900
sal_Bool to bool
Change-Id: I3a18222fe21c05edc87e480086be7e4faef3219c
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 393cb5c..ac42c4b 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -142,7 +142,7 @@ public:
virtual String GetType() = 0;
virtual sal_Bool IsUrl() = 0;
virtual sal_Bool IsNew() = 0;
- virtual sal_Bool IsUpdate() = 0;
+ virtual bool IsUpdate() = 0;
};
class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index ca292f7..9c6f1a6 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -466,7 +466,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
}
- nCount = pMgr->GetFormatCount(TYP_SEQFLD, sal_False);
+ nCount = pMgr->GetFormatCount(TYP_SEQFLD, false);
for ( i = 0; i < nCount; ++i )
{
aFormatBox.InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index b84e88b..da55531 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -462,7 +462,7 @@ sal_Bool AbstractJavaEditDialog_Impl::IsNew()
{
return pDlg->IsNew();
}
-sal_Bool AbstractJavaEditDialog_Impl::IsUpdate()
+bool AbstractJavaEditDialog_Impl::IsUpdate()
{
return pDlg->IsUpdate();
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 998bcbd..e5dbd90 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -315,7 +315,7 @@ class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
virtual String GetType();
virtual sal_Bool IsUrl();
virtual sal_Bool IsNew();
- virtual sal_Bool IsUpdate();
+ virtual bool IsUpdate();
};
//for SwJavaEditDialog end
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 2985131..67fb05d 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -109,7 +109,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
aFormatLB.Clear();
- sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, sal_False, IsFldDlgHtmlMode());
+ sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, false, IsFldDlgHtmlMode());
for( i = 0; i < nSize; ++i )
{
sal_uInt16 nEntryPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i));
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 34adbd4..3f31e0c 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -386,7 +386,7 @@ sal_uInt16 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
}
else
{
- nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode());
+ nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
for (sal_uInt16 i = 0; i < nSize; i++)
{
sal_uInt16 nPos = aSelectionLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 7577b34..b6fe5fd 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -86,7 +86,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
aTypeLB.Clear();
sal_uInt16 nPos, nTypeId;
- sal_Bool bPage = sal_False;
+ bool bPage = false;
if (!IsFldEdit())
{
@@ -104,7 +104,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
{
nPos = aTypeLB.InsertEntry(SW_RESSTR(FMT_REF_PAGE));
aTypeLB.SetEntryData(nPos, (void*)USHRT_MAX);
- bPage = sal_True;
+ bPage = true;
}
break;
@@ -207,7 +207,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
if (nTypeId != TYP_AUTHORFLD)
nCount = aLst.size();
else
- nCount = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode());
+ nCount = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
size_t nPos;
@@ -224,7 +224,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
}
else
{
- sal_Bool bInsert = sal_False;
+ bool bInsert = false;
switch (nTypeId)
{
@@ -257,7 +257,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
default:
if (aLst[i] == GetCurField()->GetPar1())
- bInsert = sal_True;
+ bInsert = true;
break;
}
if (bInsert)
@@ -477,7 +477,7 @@ sal_uInt16 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId)
if (nTypeId == TYP_AUTHORFLD)
return aFormatLB.GetEntryCount();
- sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode());
+ sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
for( sal_uInt16 i = 0; i < nSize; ++i )
{
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 03aba20..363628f 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -199,7 +199,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
// fill Format-Listbox
aFormatLB.Clear();
- sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode());
+ sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
for (sal_uInt16 i = 0; i < nSize; i++)
{
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 9604fa5..03fb292 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -273,9 +273,9 @@ SwFldMgr::~SwFldMgr()
Description: organise RefMark by names
--------------------------------------------------------------------*/
-sal_Bool SwFldMgr::CanInsertRefMark( const String& rStr )
+bool SwFldMgr::CanInsertRefMark( const String& rStr )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
OSL_ENSURE(pSh, "no SwWrtShell found");
if(pSh)
@@ -490,9 +490,9 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
Description: localise subtypes of a field
--------------------------------------------------------------------*/
-sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& rToFill)
+bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& rToFill)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
OSL_ENSURE(pSh, "no SwWrtShell found");
if(pSh)
@@ -589,7 +589,7 @@ sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& r
}
}
}
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
@@ -600,7 +600,7 @@ sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& r
--------------------------------------------------------------------*/
-sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode) const
+sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode) const
{
OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
@@ -843,9 +843,9 @@ sal_uInt16 SwFldMgr::GetCurTypeId() const
sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
{
SwField* pFld = 0;
- sal_Bool bExp = sal_False;
- sal_Bool bTbl = sal_False;
- sal_Bool bPageVar = sal_False;
+ bool bExp = false;
+ bool bTbl = false;
+ bool bPageVar = false;
sal_uLong nFormatId = rData.nFormatId;
sal_uInt16 nSubType = rData.nSubType;
sal_Unicode cSeparator = rData.cSeparator;
@@ -981,7 +981,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwHiddenTxtFieldType* pTyp =
(SwHiddenTxtFieldType*)pCurShell->GetFldType(0, RES_HIDDENTXTFLD);
pFld = new SwHiddenTxtField(pTyp, sal_True, rData.sPar1, rData.sPar2, sal_False, rData.nTypeId);
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_HIDDENPARAFLD:
@@ -989,7 +989,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwHiddenParaFieldType* pTyp =
(SwHiddenParaFieldType*)pCurShell->GetFldType(0, RES_HIDDENPARAFLD);
pFld = new SwHiddenParaField(pTyp, rData.sPar1);
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_SETREFFLD:
@@ -1007,7 +1007,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
(SwGetRefFieldType*)pCurShell->GetFldType(0, RES_GETREFFLD);
sal_uInt16 nSeqNo = (sal_uInt16)rData.sPar2.ToInt32();
pFld = new SwGetRefField(pTyp, rData.sPar1, nSubType, nSeqNo, nFormatId);
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_DDEFLD:
@@ -1107,7 +1107,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
}
pFld->ChangeFormat( nFormatId );
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_DBSETNUMBERFLD:
@@ -1156,7 +1156,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwDBNextSetFieldType* pTyp = (SwDBNextSetFieldType*)pCurShell->GetFldType(
0, RES_DBNEXTSETFLD);
pFld = new SwDBNextSetField(pTyp, sPar1, rData.sPar2, aDBData);
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_DBNUMSETFLD:
@@ -1164,7 +1164,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwDBNumSetFieldType* pTyp = (SwDBNumSetFieldType*)pCurShell->GetFldType(
0, RES_DBNUMSETFLD);
pFld = new SwDBNumSetField( pTyp, sPar1, rData.sPar2, aDBData);
- bExp = sal_True;
+ bExp = true;
break;
}
case TYP_DBSETNUMBERFLD:
@@ -1172,7 +1172,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwDBSetNumberFieldType* pTyp = (SwDBSetNumberFieldType*)
pCurShell->GetFldType(0, RES_DBSETNUMBERFLD);
pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId);
- bExp = sal_True;
+ bExp = true;
break;
}
}
@@ -1194,7 +1194,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
pFld = new SwUserField(pTyp, 0, nFormatId);
if (pFld->GetSubType() != nSubType)
pFld->SetSubType(nSubType);
- bTbl = sal_True;
+ bTbl = true;
break;
}
case TYP_INPUTFLD:
@@ -1216,7 +1216,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
pExpFld->SetPromptText(rData.sPar2);
pExpFld->SetInputFlag(sal_True) ;
- bExp = sal_True;
+ bExp = true;
pFld = pExpFld;
}
else
@@ -1247,7 +1247,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
SwSetExpField* pExpFld = new SwSetExpField( pTyp, rData.sPar2, nFormatId);
pExpFld->SetSubType(nSubType);
pExpFld->SetPar2(rData.sPar2);
- bExp = sal_True;
+ bExp = true;
pFld = pExpFld;
break;
}
@@ -1264,7 +1264,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
pTyp->SetDelimiter(rtl::OUString(cSeparator));
SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId);
- bExp = sal_True;
+ bExp = true;
pFld = pExpFld;
nSubType = nsSwGetSetExpType::GSE_SEQ;
break;
@@ -1281,7 +1281,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
0, RES_GETEXPFLD);
pFld = new SwGetExpField(pTyp, rData.sPar1, pSetTyp->GetType(), nFormatId);
pFld->SetSubType(nSubType | pSetTyp->GetType());
- bExp = sal_True;
+ bExp = true;
}
else
return sal_False;
@@ -1325,7 +1325,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
pCurShell->GetFldType(0, RES_GETEXPFLD);
pFld = new SwGetExpField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId);
pFld->SetSubType(nSubType);
- bExp = sal_True;
+ bExp = true;
}
break;
}
@@ -1333,13 +1333,13 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
pFld = new SwRefPageSetField( (SwRefPageSetFieldType*)
pCurShell->GetFldType( 0, RES_REFPAGESETFLD ),
(short)rData.sPar2.ToInt32(), 0 != nSubType );
- bPageVar = sal_True;
+ bPageVar = true;
break;
case TYP_GETREFPAGEFLD:
pFld = new SwRefPageGetField( (SwRefPageGetFieldType*)
pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ), nFormatId );
- bPageVar = sal_True;
+ bPageVar = true;
break;
case TYP_DROPDOWN :
{
@@ -1433,8 +1433,8 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
return;
pSh->StartAllAction();
- sal_Bool bSetPar2 = sal_True;
- sal_Bool bSetPar1 = sal_True;
+ bool bSetPar2 = true;
+ bool bSetPar1 = true;
String sPar1( rPar1 );
String sPar2( rPar2 );
@@ -1457,7 +1457,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
nByte = Min(nByte, sal_uInt16(MAXLEVEL));
nByte -= 1;
((SwChapterField*)pTmpFld)->SetLevel((sal_uInt8)nByte);
- bSetPar2 = sal_False;
+ bSetPar2 = false;
break;
}
@@ -1505,7 +1505,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
case TYP_GETREFFLD:
{
- bSetPar2 = sal_False;
+ bSetPar2 = false;
((SwGetRefField*)pTmpFld)->SetSubType( (sal_uInt16)rPar2.ToInt32() );
sal_uInt16 nPos = rPar2.Search( '|' );
if( STRING_NOTFOUND != nPos )
@@ -1521,7 +1521,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
pArray[nToken] = sPar2.GetToken(nToken, DB_DELIM);
((SwDropDownField*)pTmpFld)->SetItems(aEntries);
((SwDropDownField*)pTmpFld)->SetName(sPar1);
- bSetPar1 = bSetPar2 = sal_False;
+ bSetPar1 = bSetPar2 = false;
}
break;
case TYP_AUTHORITY :
@@ -1541,8 +1541,8 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) ==
pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) )
- bSetPar1 = sal_False; //otherwise it's a new or changed entry, the field needs to be updated
- bSetPar2 = sal_False;
+ bSetPar1 = false; //otherwise it's a new or changed entry, the field needs to be updated
+ bSetPar2 = false;
}
break;
}
@@ -1699,7 +1699,7 @@ void SwFldMgr::SetMacroPath(const String& rPath)
}
}
-sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal)
+sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal)
{
double fValue;
short nDefFormat;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index c9c9a9a..7053a41 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -49,7 +49,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
m_nPageId ( static_cast< sal_uInt16 >(rId.GetId()) ),
m_nTypeSel (LISTBOX_ENTRY_NOTFOUND),
m_nSelectionSel (LISTBOX_ENTRY_NOTFOUND),
- m_bFldEdit (sal_False),
+ m_bFldEdit (false),
m_bInsert (sal_True),
m_bFldDlgHtmlMode (sal_False),
m_bRefresh (sal_False),
@@ -148,7 +148,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const Str
pView->GetViewFrame()->GetBindings().GetRecorder();
if ( xRecorder.is() )
{
- sal_Bool bRecordDB = TYP_DBFLD == nTypeId ||
+ bool bRecordDB = TYP_DBFLD == nTypeId ||
TYP_DBSETNUMBERFLD == nTypeId ||
TYP_DBNUMSETFLD == nTypeId ||
TYP_DBNEXTSETFLD == nTypeId ||
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 3f69798..69813f6 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -35,7 +35,7 @@ class SwFldPage : public SfxTabPage
sal_uInt16 m_nPageId;
sal_uInt16 m_nTypeSel;
sal_uInt16 m_nSelectionSel;
- sal_Bool m_bFldEdit;
+ bool m_bFldEdit;
sal_Bool m_bInsert;
sal_Bool m_bFldDlgHtmlMode;
sal_Bool m_bRefresh;
@@ -62,7 +62,7 @@ protected:
void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0,
ListBox* pLst3 = 0 );
void EnableInsert(sal_Bool bEnable = sal_True);
- inline sal_Bool IsFldEdit() const { return m_bFldEdit; }
+ inline bool IsFldEdit() const { return m_bFldEdit; }
// insert field
sal_Bool InsertFld( sal_uInt16 nTypeId,
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 520ae57..13eeca7 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -697,7 +697,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
}
else
{
- nSize = GetFldMgr().GetFormatCount( nTypeId, sal_False, IsFldDlgHtmlMode() );
+ nSize = GetFldMgr().GetFormatCount( nTypeId, false, IsFldDlgHtmlMode() );
}
break;
}
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 684a566..f7d6511 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -273,7 +273,7 @@ void SwFldDlg::Activate()
SwView* pView = ::GetActiveView();
if( pView )
{
- sal_Bool bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0;
+ bool bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0;
const SwWrtShell& rSh = pView->GetWrtShell();
GetOKButton().Enable( !rSh.IsReadOnlyAvailable() ||
!rSh.HasReadonlySel() );
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index cb4fb73..495e748 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -777,7 +777,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
aNumFormatLB.SelectEntry(sOldSel);
}
- sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode());
+ sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
for (sal_uInt16 i = 0; i < nSize; i++)
{
@@ -1246,7 +1246,7 @@ sal_uInt16 SwFldVarPage::GetGroup()
SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) :
ListBox (pDialog, rResId),
- bCallAddSelection(sal_False)
+ bCallAddSelection(false)
{
}
@@ -1259,14 +1259,14 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
const KeyCode aKeyCode = pKEvt->GetKeyCode();
const sal_uInt16 nModifier = aKeyCode.GetModifier();
if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
- bCallAddSelection = sal_True;
+ bCallAddSelection = true;
}
if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
{
const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt or Ctrl
- bCallAddSelection = sal_True;
+ bCallAddSelection = true;
}
return nHandled;
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index c7804c2..3df2573 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -35,7 +35,7 @@ class SwFldVarPage;
class SelectionListBox : public ListBox
{
- sal_Bool bCallAddSelection;
+ bool bCallAddSelection;
virtual long PreNotify( NotifyEvent& rNEvt );
@@ -43,8 +43,8 @@ public:
SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId );
// detect selection via Ctrl or Alt and evaluate with SelectHdl
- sal_Bool IsCallAddSelection() const {return bCallAddSelection;}
- void ResetCallAddSelection() {bCallAddSelection = sal_False;}
+ bool IsCallAddSelection() const {return bCallAddSelection;}
+ void ResetCallAddSelection() {bCallAddSelection = false;}
};
class SwFldVarPage : public SwFldPage
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index a2fb248..42fbb50 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -144,7 +144,7 @@ void SwFldInputDlg::Apply()
rtl::OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
rSh.StartAllAction();
- sal_Bool bModified = sal_False;
+ bool bModified = false;
if(pInpFld)
{
if(pUsrType)
@@ -153,21 +153,21 @@ void SwFldInputDlg::Apply()
{
pUsrType->SetContent(aTmp);
pUsrType->UpdateFlds();
- bModified = sal_True;
+ bModified = true;
}
}
else if( !aTmp.equals(pInpFld->GetPar1()) )
{
pInpFld->SetPar1(aTmp);
rSh.SwEditShell::UpdateFlds(*pInpFld);
- bModified = sal_True;
+ bModified = true;
}
}
else if( !aTmp.equals(pSetFld->GetPar2()) )
{
pSetFld->SetPar2(aTmp);
rSh.SwEditShell::UpdateFlds(*pSetFld);
- bModified = sal_True;
+ bModified = true;
}
if( bModified )
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 3ba8c81..2dc77ce 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -220,7 +220,7 @@ void SwJavaEditDialog::SetFld()
aType = "JavaScript";
}
-sal_Bool SwJavaEditDialog::IsUpdate()
+bool SwJavaEditDialog::IsUpdate()
{
return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
}
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index f933604..846ad71 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -209,7 +209,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
}
}
- nCount = pMgr->GetFormatCount(TYP_SEQFLD, sal_False);
+ nCount = pMgr->GetFormatCount(TYP_SEQFLD, false);
for ( i = 0; i < nCount; ++i )
{
m_pFormatBox->InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 99e0496..c42cd34 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -166,7 +166,7 @@ public:
sal_Bool bIsTable, const String& rFldName);
// organise RefMark with names
- sal_Bool CanInsertRefMark( const String& rStr );
+ bool CanInsertRefMark( const String& rStr );
// access to field types via ResId
@@ -193,13 +193,13 @@ public:
static sal_uInt16 GetPos(sal_uInt16 nTypeId);
// subtypes to a type
- sal_Bool GetSubTypes(sal_uInt16 nId, std::vector<rtl::OUString>& rToFill);
+ bool GetSubTypes(sal_uInt16 nId, std::vector<rtl::OUString>& rToFill);
// format to a type
- sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode = sal_False) const;
+ sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode = sal_False) const;
String GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
- sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
+ sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
// turn off evaluation of expression fields for insertation
// of many expressino fields (see labels)
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 2bb2c97..4bce023 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -88,7 +88,7 @@ public:
sal_Bool IsUrl() { return bIsUrl; }
sal_Bool IsNew() { return bNew; }
- sal_Bool IsUpdate();
+ bool IsUpdate();
};
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 124be9b..5eb4940 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -103,7 +103,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
Window *pMDI = &GetView().GetViewFrame()->GetWindow();
sal_Bool bMore = sal_False;
- sal_Bool bIsText = sal_True;
+ bool bIsText = true;
sal_uInt16 nInsertType = 0;
sal_uInt16 nInsertSubType = 0;
sal_uLong nInsertFormat = 0;
@@ -494,7 +494,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
rtl::OUString aType, aText;
sal_Bool bIsUrl=sal_False;
- sal_Bool bNew=sal_False, bUpdate=sal_False;
+ sal_Bool bNew=sal_False;
+ bool bUpdate = false;
SwFldMgr* pMgr = new SwFldMgr;
if ( pItem )
{
@@ -550,21 +551,21 @@ void SwTextShell::ExecField(SfxRequest &rReq)
case FN_INSERT_FLD_DATE :
nInsertType = TYP_DATEFLD;
- bIsText = sal_False;
+ bIsText = false;
goto FIELD_INSERT;
case FN_INSERT_FLD_TIME :
nInsertType = TYP_TIMEFLD;
- bIsText = sal_False;
+ bIsText = false;
goto FIELD_INSERT;
case FN_INSERT_FLD_PGNUMBER:
nInsertType = TYP_PAGENUMBERFLD;
nInsertFormat = SVX_NUM_PAGEDESC; // wie Seitenvorlage
- bIsText = sal_False;
+ bIsText = false;
goto FIELD_INSERT;
case FN_INSERT_FLD_PGCOUNT :
nInsertType = TYP_DOCSTATFLD;
nInsertSubType = 0;
- bIsText = sal_False;
+ bIsText = false;
nInsertFormat = SVX_NUM_PAGEDESC;
goto FIELD_INSERT;
case FN_INSERT_FLD_TOPIC :
More information about the Libreoffice-commits
mailing list