summaryrefslogtreecommitdiff
path: root/sw/source/core/fields
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-11-17 19:04:02 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-11-17 19:06:39 +0900
commit30bd9fbd9317aeee15edbf98e50be59236c60a67 (patch)
tree481c4800b9fa3bbd341f28367662871f9df72321 /sw/source/core/fields
parent3dd3fc17a6b8f5dbc3d795ac80ad737647ab553c (diff)
sal_Bool to bool
Change-Id: I4700455a1f2057ac2cc32da0260c810311c84a4f
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r--sw/source/core/fields/dbfld.cxx20
-rw-r--r--sw/source/core/fields/expfld.cxx2
-rw-r--r--sw/source/core/fields/usrfld.cxx4
3 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 713684b54c46..4b4d0ba9c42c 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -191,9 +191,9 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
: SwValueField(pTyp, nFmt),
nSubType(0),
- bIsInBodyTxt(sal_True),
- bValidValue(sal_False),
- bInitialized(sal_False)
+ bIsInBodyTxt(true),
+ bValidValue(false),
+ bInitialized(false)
{
if (GetTyp())
((SwDBFieldType*)GetTyp())->AddRef();
@@ -286,7 +286,7 @@ String SwDBField::GetFieldName() const
//------------------------------------------------------------------------------
-void SwDBField::ChgValue( double d, sal_Bool bVal )
+void SwDBField::ChgValue( double d, bool bVal )
{
bValidValue = bVal;
SetValue(d);
@@ -314,7 +314,7 @@ void SwDBField::Evaluate()
SwNewDBMgr* pMgr = GetDoc()->GetNewDBMgr();
// erstmal loeschen
- bValidValue = sal_False;
+ bValidValue = false;
double nValue = DBL_MAX;
const SwDBData& aTmpData = GetDBData();
@@ -343,7 +343,7 @@ void SwDBField::Evaluate()
if (*pDocFormatter->GetNullDate() != aStandard)
nValue += (aStandard - *pDocFormatter->GetNullDate());
}
- bValidValue = sal_True;
+ bValidValue = true;
SetValue(nValue);
aContent = ((SwValueFieldType*)GetTyp())->ExpandValue(nValue, GetFormat(), GetLanguage());
}
@@ -358,7 +358,7 @@ void SwDBField::Evaluate()
SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
if (nFmt && nFmt != SAL_MAX_UINT32 && !pFormatter->IsTextFormat(nFmt))
- bValidValue = sal_True; // Wegen Bug #60339 nicht mehr bei allen Strings
+ bValidValue = true; // Wegen Bug #60339 nicht mehr bei allen Strings
}
else
{
@@ -366,7 +366,7 @@ void SwDBField::Evaluate()
SetValue(aContent.isEmpty() ? 0 : 1);
}
}
- bInitialized = sal_True;
+ bInitialized = true;
}
/*--------------------------------------------------------------------
@@ -613,7 +613,7 @@ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
const String& rCond,
const String& ,
const SwDBData& rDBData) :
- SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(sal_True)
+ SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(true)
{}
//------------------------------------------------------------------------------
@@ -715,7 +715,7 @@ SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp,
SwDBNameInfField(pTyp, rDBData),
aCond(rCond),
aPar2(rDBNum),
- bCondValid(sal_True)
+ bCondValid(true)
{}
//------------------------------------------------------------------------------
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 5701f0139482..0e11e2769104 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -110,7 +110,7 @@ static sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
//-----------------------------------------------------------------------------
-void ReplacePoint( String& rTmpName, sal_Bool bWithCommandType )
+void ReplacePoint( String& rTmpName, bool bWithCommandType )
{
// replace first and last (if bWithCommandType: last two) dot Ersten und letzten Punkt ersetzen, da in Tabellennamen Punkte erlaubt sind
// since table names may contain dots
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 7457fc799463..189221c089cd 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -188,7 +188,7 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const String& aNam )
nValue( 0 ),
nType(nsSwGetSetExpType::GSE_STRING)
{
- bValidValue = bDeleted = sal_False;
+ bValidValue = bDeleted = false;
aName = aNam;
if (nType & nsSwGetSetExpType::GSE_STRING)
@@ -250,7 +250,7 @@ double SwUserFieldType::GetValue( SwCalc& rCalc )
rCalc.Pop();
if( !rCalc.IsCalcError() )
- bValidValue = sal_True;
+ bValidValue = true;
else
nValue = 0;