Kaydet (Commit) c849c4b9 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

sal_Bool->bool in hwpfilter

Change-Id: Ief6d6678a04084a90d07d87780689b92af2e3ba4
üst 2e7c6b86
...@@ -371,20 +371,14 @@ void HwpReader::makeMeta() ...@@ -371,20 +371,14 @@ void HwpReader::makeMeta()
static struct static struct
{ {
const char *name; const char *name;
sal_Bool bMade; bool bMade;
} }
ArrowShape[] = ArrowShape[] =
{ {
{ "", sal_False }, { "", false },
{ { "Arrow", false },
"Arrow", sal_False { "Line Arrow", false },
}, { "Square", false }
{ "Line Arrow", sal_False },
{
"Square", sal_False
}
}; };
static struct static struct
...@@ -449,7 +443,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) ...@@ -449,7 +443,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
{ {
if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade ) if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade )
{ {
ArrowShape[prop->line_tstyle].bMade = sal_True; ArrowShape[prop->line_tstyle].bMade = true;
padd(ascii("draw:name"), sXML_CDATA, padd(ascii("draw:name"), sXML_CDATA,
ascii(ArrowShape[prop->line_tstyle].name)); ascii(ArrowShape[prop->line_tstyle].name));
if( prop->line_tstyle == 1 ) if( prop->line_tstyle == 1 )
...@@ -473,7 +467,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) ...@@ -473,7 +467,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
} }
if( prop->line_hstyle && !ArrowShape[prop->line_hstyle].bMade) if( prop->line_hstyle && !ArrowShape[prop->line_hstyle].bMade)
{ {
ArrowShape[prop->line_hstyle].bMade = sal_True; ArrowShape[prop->line_hstyle].bMade = true;
padd(ascii("draw:name"), sXML_CDATA, padd(ascii("draw:name"), sXML_CDATA,
ascii(ArrowShape[prop->line_hstyle].name)); ascii(ArrowShape[prop->line_hstyle].name));
if( prop->line_hstyle == 1 ) if( prop->line_hstyle == 1 )
...@@ -927,7 +921,7 @@ struct PageSetting ...@@ -927,7 +921,7 @@ struct PageSetting
footer_odd = 0L; footer_odd = 0L;
footer_even = 0L; footer_even = 0L;
pagenumber=0L; pagenumber=0L;
bIsSet = sal_False; bIsSet = false;
} }
HeaderFooter *header ; HeaderFooter *header ;
HeaderFooter *header_odd ; HeaderFooter *header_odd ;
...@@ -936,7 +930,7 @@ struct PageSetting ...@@ -936,7 +930,7 @@ struct PageSetting
HeaderFooter *footer_odd ; HeaderFooter *footer_odd ;
HeaderFooter *footer_even ; HeaderFooter *footer_even ;
ShowPageNum *pagenumber; ShowPageNum *pagenumber;
sal_Bool bIsSet; bool bIsSet;
}; };
void HwpReader::makeMasterStyles() void HwpReader::makeMasterStyles()
...@@ -951,12 +945,12 @@ void HwpReader::makeMasterStyles() ...@@ -951,12 +945,12 @@ void HwpReader::makeMasterStyles()
{ {
ShowPageNum *pn = hwpfile.getPageNumber(i); ShowPageNum *pn = hwpfile.getPageNumber(i);
pSet[pn->m_nPageNumber].pagenumber = pn; pSet[pn->m_nPageNumber].pagenumber = pn;
pSet[pn->m_nPageNumber].bIsSet = sal_True; pSet[pn->m_nPageNumber].bIsSet = true;
} }
for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ ) for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ )
{ {
HeaderFooter* hf = hwpfile.getHeaderFooter(i); HeaderFooter* hf = hwpfile.getHeaderFooter(i);
pSet[hf->m_nPageNumber].bIsSet = sal_True; pSet[hf->m_nPageNumber].bIsSet = true;
if( hf->type == 0 ) // header if( hf->type == 0 ) // header
{ {
switch( hf->where ) switch( hf->where )
......
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