summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww1
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-12-25 22:17:38 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-12-26 09:48:15 +0900
commit5bfe7ed9e7a3fdb3106ab8d61624ba0136073fb9 (patch)
tree814b2eca6c9c66e3c09fe3482b129baa6c5d1fe6 /sw/source/filter/ww1
parent8b456d10989438616466e95bf2062efc2ba32659 (diff)
sal_Bool to bool
Change-Id: I42b4d27101f663a75aa8fc1c13e5ec3f03c8a2da
Diffstat (limited to 'sw/source/filter/ww1')
-rw-r--r--sw/source/filter/ww1/w1class.cxx2
-rw-r--r--sw/source/filter/ww1/w1class.hxx18
-rw-r--r--sw/source/filter/ww1/w1filter.cxx30
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx4
4 files changed, 27 insertions, 27 deletions
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 28b543503223..e39e8d3fe511 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -1188,7 +1188,7 @@ void Ww1Chp::operator++()
////////////////////////////////////////////////////////////// Manager
Ww1Manager::Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs)
- : bOK(sal_False), bInTtp(sal_False), bInStyle(sal_False), bStopAll(sal_False), aFib(rStrm),
+ : bOK(sal_False), bInTtp(false), bInStyle(false), bStopAll(false), aFib(rStrm),
aDop(aFib), aFonts(aFib, nFieldFlgs), aDoc(aFib), pDoc(&aDoc),
ulDocSeek(0), pSeek(&ulDocSeek), aFld(aFib), pFld(&aFld), aChp(aFib),
aPap(aFib), aFtn(aFib), aBooks(aFib),
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index acc52a1601fe..b6cb854abd56 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -1496,9 +1496,9 @@ public:
class Ww1Manager
{
sal_Bool bOK;
- sal_Bool bInTtp;
- sal_Bool bInStyle;
- sal_Bool bStopAll;
+ bool bInTtp;
+ bool bInStyle;
+ bool bStopAll;
Ww1Fib aFib;
Ww1Dop aDop;
Ww1Fonts aFonts;
@@ -1526,12 +1526,12 @@ public:
sal_Bool GetError() const { return !bOK; }
// Fuer Tabellen
- void SetInTtp(sal_Bool bSet = sal_True) { bInTtp = bSet; }
- sal_Bool IsInTtp() const { return bInTtp; }
- void SetInStyle(sal_Bool bSet = sal_True) { bInStyle = bSet; }
- sal_Bool IsInStyle() const { return bInStyle; }
- void SetStopAll(sal_Bool bSet = sal_True) { bStopAll = bSet; }
- sal_Bool IsStopAll() const { return bStopAll; }
+ void SetInTtp(bool bSet = true) { bInTtp = bSet; }
+ bool IsInTtp() const { return bInTtp; }
+ void SetInStyle(bool bSet = true) { bInStyle = bSet; }
+ bool IsInStyle() const { return bInStyle; }
+ void SetStopAll(bool bSet = true) { bStopAll = bSet; }
+ bool IsStopAll() const { return bStopAll; }
sal_Bool HasInTable();
sal_Bool HasTtp();
sal_Bool LastHasTtp();
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index bf31f5a71867..9aa175520c06 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -96,9 +96,9 @@ Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This)
if (!This.Pushed())
{
{ // der wird nur temporaer gebraucht:
- This.SetInStyle( sal_True );
+ This.SetInStyle( true );
Ww1StyleSheet(This.aFib).Out(rOut, This);
- This.SetInStyle( sal_False );
+ This.SetInStyle( false );
}
{ // dieser auch:
Ww1Assoc(This.aFib).Out(rOut);
@@ -128,9 +128,9 @@ Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This)
// ist:
cUnknown = This.pDoc->Out(rOut, *This.pSeek);
}
- This.SetStopAll(sal_True);
+ This.SetStopAll(true);
This.OutStop(rOut, cUnknown); // Damit die Attribute am Ende geschlossen
- This.SetStopAll(sal_False); // werden
+ This.SetStopAll(false); // werden
return rOut;
}
@@ -213,7 +213,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
// Optimierung: Sie werden nur auf sinnvolle Werte gesetzt, wenn
// das 0x07-Zeiche ansteht.
- sal_Bool bLIsTtp = sal_False;
+ bool bLIsTtp = false;
sal_Bool bLHasTtp = sal_False;
if( cUnknown == 0x07 )
{
@@ -484,7 +484,7 @@ static WWDateTime GetTimeDatePara( const String& rForm,
DFF_DDDMMMY, DFF_DDDMMMY, DFF_DDDMMMYY, DFF_DDDMMMYY
};
- sal_Bool bHasDay = STRING_NOTFOUND != rForm.Search( 't' ) ||
+ bool bHasDay = STRING_NOTFOUND != rForm.Search( 't' ) ||
STRING_NOTFOUND != rForm.Search( 'T' ) ||
STRING_NOTFOUND != rForm.Search( 'd' ) ||
STRING_NOTFOUND != rForm.Search( 'D' );
@@ -603,7 +603,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
pData = GetData();
}
OSL_ENSURE(pData->chGet()==21, "Ww1PlainText");
- sal_Bool bKnown = sal_True;
+ bool bKnown = true;
OSL_ENSURE(pField==0, "Ww1PlainText");
if (pField != 0)
{
@@ -678,7 +678,7 @@ oncemore:
IS("anzzeichen", "numberofchars", 28)
IS("dateiname", "filename", 29)
IS("vorlage", "templatename", 30)
- bKnown = sal_False;
+ bKnown = false;
#undef IS
if (rbType != 14)
goto oncemore;
@@ -923,14 +923,14 @@ oncemore:
|| sExt.EqualsIgnoreCaseAscii( ".pic" ))
rOut.AddGraphic( sName );
else
- bKnown = sal_False;
+ bKnown = false;
}
else
- bKnown = sal_False;
+ bKnown = false;
}
break;
default: // unknown
- OSL_ENSURE(sal_False, "Ww1PlainText");
+ OSL_ENSURE(false, "Ww1PlainText");
// unsupported:
case 1: // unknown
case 2: // possible bookmark
@@ -964,7 +964,7 @@ oncemore:
case 52: // auto number outline
case 53: // auto number legal
case 54: // auto number arabic
- bKnown = sal_False;
+ bKnown = false;
break;
}
if( bKnown || sErgebnis.EqualsAscii( "\270" ))
@@ -1083,7 +1083,7 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
rOut << SvxUnderlineItem(UNDERLINE_NONE, RES_CHRATR_UNDERLINE) <<
SvxWordLineModeItem(sal_False, RES_CHRATR_WORDLINEMODE);
} break;
- default: OSL_ENSURE(sal_False, "Chpx");
+ default: OSL_ENSURE(false, "Chpx");
case 1: {
rOut << SvxUnderlineItem(UNDERLINE_SINGLE, RES_CHRATR_UNDERLINE);
} break;
@@ -1101,7 +1101,7 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
if (fsIcoGet())
switch(icoGet()) {
- default: OSL_ENSURE(sal_False, "Chpx");
+ default: OSL_ENSURE(false, "Chpx");
case 0: { rOut.EndItem(RES_CHRATR_COLOR); } break;
case 1: { rOut << SvxColorItem(Color(COL_BLACK), RES_CHRATR_COLOR); } break;
case 2: { rOut << SvxColorItem(Color(COL_LIGHTBLUE), RES_CHRATR_COLOR); } break;
@@ -1373,7 +1373,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
}
else
{
- OSL_ENSURE(sal_False, "WW1Fonts::GetFont: Nicht existenter Font !");
+ OSL_ENSURE(false, "WW1Fonts::GetFont: Nicht existenter Font !");
eFamily = FAMILY_SWISS;
aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helv" ));
ePitch = PITCH_VARIABLE;
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index a1ec40efd461..95344830acd6 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -229,7 +229,7 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
pLine->SetWidth( DEF_LINE_WIDTH_0 );
}
else
- OSL_ENSURE(sal_False, "unknown linewidth");
+ OSL_ENSURE(false, "unknown linewidth");
}
return pLine;
}
@@ -415,7 +415,7 @@ void Ww1SingleSprmSColumns::Start(
void Ww1SingleSprmPTtp::Start(
Ww1Shell& /*rOut*/, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager& rMan)
{
- rMan.SetInTtp( sal_True ); // Besonderheit: wird bei InTable::Stop und
+ rMan.SetInTtp( true ); // Besonderheit: wird bei InTable::Stop und
// nicht bei InTtp::Stop zurueckgesetzt,
// da Auswertung in InTable
}