summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-09-25 15:30:51 +0200
committerMichael Stahl <mstahl@redhat.com>2012-10-04 21:29:32 +0200
commitdea967349cea054b20fdfb22d6c59eee08f3faeb (patch)
tree33cca284b9cc50347ce77bf44e6e1a665493bec3 /hwpfilter
parentc69280ab4ef3d24d255605620ce5a4faca3ea184 (diff)
sal_Bool -> bool in hwpfilter
Change-Id: Ia1b6830ef9ab06a1914abb7f6d5857ce9d845061
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hwpreader.cxx56
1 files changed, 28 insertions, 28 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 44e85441f26c..b3568362d958 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -94,16 +94,16 @@ struct HwpReaderPrivate
{
HwpReaderPrivate()
{
- bFirstPara = sal_True;
- bInBody = sal_False;
- bInHeader = sal_False;
+ bFirstPara = true;
+ bInBody = false;
+ bInHeader = false;
nPnPos = 0;
pPn = 0L;
}
- sal_Bool bFirstPara;
- sal_Bool bInBody;
- sal_Bool bInHeader;
+ bool bFirstPara;
+ bool bInBody;
+ bool bInHeader;
ShowPageNum *pPn;
int nPnPos;
};
@@ -196,10 +196,10 @@ void HwpReader::makeBody()
rstartEl(ascii("office:body"), rList);
makeTextDecls();
HWPPara *hwppara = hwpfile.GetFirstPara();
- d->bInBody = sal_True;
+ d->bInBody = true;
parsePara(hwppara);
rendEl(ascii("office:body"));
- d->bInBody = sal_False;
+ d->bInBody = false;
}
@@ -1109,11 +1109,11 @@ void HwpReader::makeMasterStyles()
rstartEl(ascii("style:header"), rList);
if( pPage->pagenumber && pPage->pagenumber->where < 4 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->header->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
rendEl(ascii("style:header"));
}
@@ -1123,12 +1123,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 3;
}
parsePara(pPage->header_even->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:header"));
@@ -1158,12 +1158,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->nPnPos = 1;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->header_odd->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:header-left"));
@@ -1210,11 +1210,11 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
}
parsePara(pPage->footer->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
rendEl(ascii("style:footer"));
}
@@ -1224,12 +1224,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 3;
}
parsePara(pPage->footer_even->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:footer"));
@@ -1259,12 +1259,12 @@ void HwpReader::makeMasterStyles()
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
- d->bInHeader = sal_True;
+ d->bInHeader = true;
d->pPn = pPage->pagenumber;
d->nPnPos = 1;
}
parsePara(pPage->footer_odd->plist.front());
- d->bInHeader = sal_False;
+ d->bInHeader = false;
d->pPn = 0L;
d->nPnPos = 0;
rendEl(ascii("style:footer-left"));
@@ -2722,12 +2722,12 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
padd(ascii("text:style-name"), sXML_CDATA,
ascii(getTStyleName(para->cshape.index, buf)));
@@ -2793,12 +2793,12 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
padd(ascii("text:style-name"), sXML_CDATA,
ascii(getTStyleName(curr, buf)));
@@ -2871,14 +2871,14 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
if( !pstart )
STARTP;
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
for (n = 0; n < para->nch && para->hhstr[n]->hh;
@@ -4811,12 +4811,12 @@ void HwpReader::parsePara(HWPPara * para, sal_Bool bParaStart)
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
- d->bFirstPara = sal_False;
+ d->bFirstPara = false;
}
if( d->bInHeader )
{
makeShowPageNum();
- d->bInHeader = sal_False;
+ d->bInHeader = false;
}
rendEl( ascii("text:p") );