diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-22 14:14:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-23 11:11:50 +0200 |
| commit | 2692047aacef7b4288f995ce6ff2db5e16b71014 (patch) | |
| tree | 2d43552ad1a01cfb6287d54f35b5ae3ca538393b /lotuswordpro/source/filter/xfilter | |
| parent | ca56379f27c53d4fa015d7adbb9494186f506de6 (diff) | |
lotuswordpro: sal_Bool->bool
Change-Id: I017d284a2fbc8d50a9928c9d934ffe710b0c652f
Diffstat (limited to 'lotuswordpro/source/filter/xfilter')
68 files changed, 412 insertions, 412 deletions
diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx index c8c8d3fe5ff6..eb2dcf184ba1 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx @@ -102,7 +102,7 @@ public: * @param: pStyle the style to be compared. * @return: return sal_True if equals,else sal_False. */ - virtual sal_Bool Equal(IXFStyle *pStyle) = 0; + virtual bool Equal(IXFStyle *pStyle) = 0; }; diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx index 1f0f7c5d6cee..eab7984d8ed1 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx @@ -62,10 +62,10 @@ XFBGImage::XFBGImage() { - m_bUserFileLink = sal_False; - m_bRepeate = sal_False; - m_bStretch = sal_False; - m_bPosition = sal_True; + m_bUserFileLink = false; + m_bRepeate = false; + m_bStretch = false; + m_bPosition = true; m_eHoriAlign = enumXFAlignCenter; m_eVertAlign = enumXFAlignCenter; } @@ -73,12 +73,12 @@ XFBGImage::XFBGImage() void XFBGImage::SetImageData(sal_uInt8 *buf, int len) { m_strData = XFBase64::Encode(buf,len); - m_bUserFileLink = sal_False; + m_bUserFileLink = false; } -sal_Bool XFBGImage::Equal(IXFStyle * /* pStyle */) +bool XFBGImage::Equal(IXFStyle * /* pStyle */) { - return sal_False; + return false; } void XFBGImage::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx index 2a78366e90d4..d0564bbb0c42 100644 --- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx @@ -101,7 +101,7 @@ public: * @descr decide whether there has been a style that is the same as this object. * If it use base64 stream, i'll simply return sal_False because it's too slow to compare two base64 stream. */ - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -110,10 +110,10 @@ public: private: OUString m_strFileName; OUString m_strData; - sal_Bool m_bUserFileLink; - sal_Bool m_bRepeate; - sal_Bool m_bStretch; - sal_Bool m_bPosition; + bool m_bUserFileLink; + bool m_bRepeate; + bool m_bStretch; + bool m_bPosition; enumXFAlignType m_eHoriAlign; enumXFAlignType m_eVertAlign; }; @@ -121,31 +121,31 @@ private: inline void XFBGImage::SetFileLink(const OUString& fileName) { m_strFileName = fileName; - m_bUserFileLink = sal_True; + m_bUserFileLink = true; } inline void XFBGImage::SetPosition(enumXFAlignType horiAlign, enumXFAlignType vertAlign) { - m_bPosition = sal_True; + m_bPosition = true; m_eHoriAlign = horiAlign; m_eVertAlign = vertAlign; - m_bStretch = sal_False; - m_bRepeate = sal_False; + m_bStretch = false; + m_bRepeate = false; } inline void XFBGImage::SetRepeate() { - m_bRepeate = sal_True; - m_bStretch = sal_False; - m_bPosition = sal_False; + m_bRepeate = true; + m_bStretch = false; + m_bPosition = false; } inline void XFBGImage::SetStretch() { - m_bStretch = sal_True; - m_bRepeate = sal_False; - m_bPosition = sal_False; + m_bStretch = true; + m_bRepeate = false; + m_bPosition = false; } #endif diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx index da9516703b88..6b8aabc62972 100644 --- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx @@ -69,7 +69,7 @@ class XFBookmark : public XFContent { public: - XFBookmark(sal_Bool isStart) + XFBookmark(bool isStart) { m_bStart = isStart; } @@ -106,7 +106,7 @@ public: } private: - sal_Bool m_bStart; + bool m_bStart; OUString m_strName; OUString m_strDivision; }; @@ -114,13 +114,13 @@ private: class XFBookmarkStart : public XFBookmark { public: - XFBookmarkStart():XFBookmark(sal_True){} + XFBookmarkStart():XFBookmark(true){} }; class XFBookmarkEnd : public XFBookmark { public: - XFBookmarkEnd():XFBookmark(sal_False){} + XFBookmarkEnd():XFBookmark(false){} }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx index d78760fbf46b..ec406b949ac2 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.cxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx @@ -62,8 +62,8 @@ XFBorder::XFBorder() { m_fOffset = 0; - m_bDouble = sal_False; - m_bSameWidth = sal_False; + m_bDouble = false; + m_bSameWidth = false; m_fWidthInner = 0; m_fWidthSpace = 0; m_fWidthOuter = 0; @@ -79,7 +79,7 @@ void XFBorder::SetWidth(double width) if( !m_bDouble ) { m_fWidthInner = width; - m_bSameWidth = sal_True; + m_bSameWidth = true; } else if( m_bDouble && m_bSameWidth ) { @@ -89,7 +89,7 @@ void XFBorder::SetWidth(double width) } } -void XFBorder::SetDoubleLine(sal_Bool dual,sal_Bool bSameWidth) +void XFBorder::SetDoubleLine(bool dual,bool bSameWidth) { m_bDouble = dual; m_bSameWidth = bSameWidth; @@ -227,7 +227,7 @@ void XFBorders::SetWidth(enumXFBorder side, double width) } } -void XFBorders::SetDoubleLine(enumXFBorder side, sal_Bool dual,sal_Bool bSameWidth) +void XFBorders::SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth) { switch(side) { diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx index 8080a8dcd329..dd718422cbee 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.hxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx @@ -86,7 +86,7 @@ public: /** * @descr Set whether the border has double line. */ - void SetDoubleLine(sal_Bool dual,sal_Bool bSameWidth); + void SetDoubleLine(bool dual,bool bSameWidth); /** * @descr Set inner line width for border with double line. @@ -118,8 +118,8 @@ private: private: double m_fOffset; XFColor m_aColor; - sal_Bool m_bDouble; - sal_Bool m_bSameWidth; + bool m_bDouble; + bool m_bSameWidth; double m_fWidthInner; double m_fWidthSpace; double m_fWidthOuter; @@ -150,7 +150,7 @@ public: * @descr Set border side as doubel line. * @param bSameWidth whether two borders are same width. */ - void SetDoubleLine(enumXFBorder side, sal_Bool dual,sal_Bool bSameWidth); + void SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth); /** * @descr Set inner border with of border side. diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 0d7d9a2d1e77..eefd6945000b 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -70,7 +70,7 @@ XFCell::XFCell() m_nColSpaned = 1; m_nRepeated = 0; m_eValueType = enumXFValueTypeNone; - m_bProtect = sal_False; + m_bProtect = false; } XFCell::XFCell(const XFCell& other) : XFContentContainer(other) diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index ed983c75ae32..7cf0567c0940 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -118,7 +118,7 @@ public: /** * @descr Set cell protected. */ - void SetProtect(sal_Bool protect=sal_True); + void SetProtect(bool protect=true); /** * @descr Set cell column id. @@ -170,7 +170,7 @@ private: OUString m_strValue; OUString m_strDisplay; OUString m_strFormula; - sal_Bool m_bProtect; + bool m_bProtect; }; inline void XFCell::SetColumnSpaned(sal_Int32 num) @@ -188,7 +188,7 @@ inline void XFCell::SetFormula(const OUString& formula) m_strFormula = formula; } -inline void XFCell::SetProtect(sal_Bool protect/* =sal_True */) +inline void XFCell::SetProtect(bool protect/* =sal_True */) { m_bProtect = protect; } diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx index 95c1664944f5..f5b8d1980d0b 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx @@ -70,7 +70,7 @@ XFCellStyle::XFCellStyle() m_pBorders = NULL; m_pFont = NULL; m_pBackImage = NULL; - m_bWrapText = sal_False; + m_bWrapText = false; } XFCellStyle::~XFCellStyle() @@ -118,84 +118,84 @@ enumXFStyle XFCellStyle::GetStyleFamily() /** *Affirm whether two XFCellStyle objects are equal. */ -sal_Bool XFCellStyle::Equal(IXFStyle *pStyle) +bool XFCellStyle::Equal(IXFStyle *pStyle) { if( this == pStyle ) - return sal_True; + return true; if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleTableCell ) - return sal_False; + return false; XFCellStyle *pOther = static_cast<XFCellStyle*>(pStyle); if( !pOther ) - return sal_False; + return false; if( m_strDataStyle != pOther->m_strDataStyle ) - return sal_False; + return false; if( m_strParentStyleName != pOther->m_strParentStyleName ) - return sal_False; + return false; if( m_fTextIndent != pOther->m_fTextIndent ) - return sal_False; + return false; //align: if( m_eHoriAlign != pOther->m_eHoriAlign ) - return sal_False; + return false; if( m_eVertAlign != pOther->m_eVertAlign ) - return sal_False; + return false; if( m_aBackColor != pOther->m_aBackColor ) - return sal_False; + return false; //shadow: if( m_aShadow != pOther->m_aShadow ) - return sal_False; + return false; //margin: if( m_aMargin != pOther->m_aMargin ) - return sal_False; + return false; //padding: if( m_aPadding != pOther->m_aPadding ) - return sal_False; + return false; //wrap: if( m_bWrapText != pOther->m_bWrapText ) - return sal_False; + return false; //font: if( m_pFont ) { if( !pOther->m_pFont ) - return sal_False; + return false; if(*m_pFont != *pOther->m_pFont ) - return sal_False; + return false; } else if( pOther->m_pFont ) - return sal_False; + return false; //border: if( m_pBorders ) { if( !pOther->m_pBorders ) - return sal_False; + return false; if( *m_pBorders != *pOther->m_pBorders ) - return sal_False; + return false; } else if( pOther->m_pBorders ) - return sal_False; + return false; //if there is backimage if( m_pBackImage ) { if( !pOther->m_pBackImage ) - return sal_False; + return false; if( !m_pBackImage->Equal(pOther) ) - return sal_False; + return false; } else { if( pOther->m_pBackImage ) - return sal_False; + return false; } - return sal_True; + return true; } void XFCellStyle::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx index a660f4f135ab..f9f51bd749f4 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx @@ -123,11 +123,11 @@ public: /** * @descr Set cell value to warp if it's content is too long to be placed in an single cell. */ - void SetWrapText(sal_Bool wrap); + void SetWrapText(bool wrap); virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -145,7 +145,7 @@ private: XFFont *m_pFont; XFShadow m_aShadow; XFBorders *m_pBorders; - sal_Bool m_bWrapText; + bool m_bWrapText; }; inline void XFCellStyle::SetAlignType(enumXFAlignType hori, enumXFAlignType vert) @@ -159,7 +159,7 @@ inline void XFCellStyle::SetDataStyle(const OUString& style) m_strDataStyle = style; } -inline void XFCellStyle::SetWrapText(sal_Bool wrap) +inline void XFCellStyle::SetWrapText(bool wrap) { m_bWrapText = wrap; } diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx index 688593daf4a0..8910a53c3160 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx @@ -71,12 +71,12 @@ class XFColor public: XFColor():m_nRed((sal_Int8)0),m_nGreen((sal_Int8)0),m_nBlue((sal_Int8)0) { - m_bValid = sal_False; + m_bValid = false; } XFColor(sal_Int32 red, sal_Int32 green, sal_Int32 blue) :m_nRed((sal_Int8)red),m_nGreen((sal_Int8)green),m_nBlue((sal_Int8)blue) { - m_bValid = sal_True; + m_bValid = true; } XFColor(sal_uInt32 color) { @@ -90,7 +90,7 @@ public: temp = c; m_nBlue = static_cast<sal_uInt8>((temp&0x00ff0000)>>16); - m_bValid = sal_True; + m_bValid = true; } /** @@ -111,7 +111,7 @@ public: /** * @descr helper function to assert whether a color is valid. */ - sal_Bool IsValid() const{ return m_bValid;} + bool IsValid() const{ return m_bValid;} OUString ToString ()const; @@ -121,7 +121,7 @@ private: sal_uInt8 m_nRed; sal_uInt8 m_nGreen; sal_uInt8 m_nBlue; - sal_Bool m_bValid; + bool m_bValid; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx index aecace11241f..ec2df746cdc1 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx @@ -62,9 +62,9 @@ XFDate::XFDate() { - m_bFixed = 0; + m_bFixed = false; memset(&m_aDateTime, 0, sizeof(m_aDateTime)); - m_bValued = sal_False; + m_bValued = false; } XFDate::~XFDate() diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index 17f1d1960575..46bf82d39989 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -80,29 +80,29 @@ public: void SetText(OUString& text); - void SetFixed(sal_Bool fixed = sal_True); + void SetFixed(bool fixed = true); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: - sal_Bool m_bFixed; + bool m_bFixed; OUString m_strText; XFDateTime m_aDateTime; OUString m_strDate; - sal_Bool m_bValued; + bool m_bValued; }; inline void XFDate::SetDate(XFDateTime& dt) { m_aDateTime = dt; m_strDate = DateTimeToOUString(m_aDateTime); - m_bValued = sal_True; + m_bValued = true; } inline void XFDate::SetDate(const OUString& date) { m_strDate = date; - m_bValued = sal_True; + m_bValued = true; } inline void XFDate::SetText(OUString& text) @@ -110,7 +110,7 @@ inline void XFDate::SetText(OUString& text) m_strText = text; } -inline void XFDate::SetFixed(sal_Bool fixed) +inline void XFDate::SetFixed(bool fixed) { m_bFixed = fixed; } diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx index ae0581c0dc1a..bdd1d15419c0 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx @@ -61,7 +61,7 @@ XFDatePart::XFDatePart() { - m_bTexture = sal_False; + m_bTexture = false; } void XFDatePart::ToXml(IXFStream *pStrm) @@ -159,8 +159,8 @@ void XFDatePart::ToXml(IXFStream *pStrm) XFDateStyle::XFDateStyle() { - m_bFixed = sal_False; - m_bAutoOrder = sal_False; + m_bFixed = false; + m_bAutoOrder = false; } XFDateStyle::~XFDateStyle() diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx index c4d1fd1b1a84..c6c01b439134 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx @@ -72,12 +72,12 @@ class XFDatePart : public XFTimePart public: XFDatePart(); public: - void SetTexture(sal_Bool bTexture); + void SetTexture(bool bTexture); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: - sal_Bool m_bTexture; + bool m_bTexture; }; class XFDateStyle : public XFStyle @@ -89,35 +89,35 @@ public: public: - void SetFixed(sal_Bool fixed); + void SetFixed(bool fixed); void SetLanguage(const OUString& lang); void SetCountry(const OUString& country); - void SetAutoOrder(sal_Bool bAutoOrder); + void SetAutoOrder(bool bAutoOrder); - void AddYear( sal_Bool bLongFmt = sal_True ); + void AddYear( bool bLongFmt = true ); - void AddMonth( sal_Bool bLongFmt = sal_True, sal_Bool bTexture = sal_False ); + void AddMonth( bool bLongFmt = true, bool bTexture = false ); - void AddMonthDay( sal_Bool bLongFmt = sal_True ); + void AddMonthDay( bool bLongFmt = true ); - void AddWeekDay( sal_Bool bLongFmt = sal_True ); + void AddWeekDay( bool bLongFmt = true ); void AddYearWeek(); - void AddEra(sal_Bool bLongFmt = sal_False); + void AddEra(bool bLongFmt = false); - void AddQuarter(sal_Bool bLongFmt = sal_False); + void AddQuarter(bool bLongFmt = false); - void AddHour( sal_Bool bLongFmt = sal_True ); + void AddHour( bool bLongFmt = true ); - void AddMinute( sal_Bool bLongFmt = sal_True ); + void AddMinute( bool bLongFmt = true ); - void AddSecond( sal_Bool bLongFmt = sal_True, sal_Int16 nDecimalPos = 2); + void AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2); - void AddAmPm(sal_Bool bAmPm); + void AddAmPm(bool bAmPm); void AddText( const OUString& part ); @@ -126,19 +126,19 @@ public: virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: - sal_Bool m_bFixed; - sal_Bool m_bAutoOrder; + bool m_bFixed; + bool m_bAutoOrder; OUString m_strLanguage; OUString m_strCountry; XFStyleContainer m_aParts; }; -inline void XFDatePart::SetTexture(sal_Bool bTexture) +inline void XFDatePart::SetTexture(bool bTexture) { m_bTexture = bTexture; } -inline void XFDateStyle::SetFixed(sal_Bool fixed) +inline void XFDateStyle::SetFixed(bool fixed) { m_bFixed = fixed; } @@ -153,12 +153,12 @@ inline void XFDateStyle::SetCountry(const OUString& country) m_strCountry = country; } -inline void XFDateStyle::SetAutoOrder(sal_Bool bAutoOrder) +inline void XFDateStyle::SetAutoOrder(bool bAutoOrder) { m_bAutoOrder = bAutoOrder; } -inline void XFDateStyle::AddYear( sal_Bool bLongFmt ) +inline void XFDateStyle::AddYear( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateYear); @@ -166,7 +166,7 @@ inline void XFDateStyle::AddYear( sal_Bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddMonth( sal_Bool bLongFmt, sal_Bool bTexture ) +inline void XFDateStyle::AddMonth( bool bLongFmt, bool bTexture ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateMonth); @@ -175,7 +175,7 @@ inline void XFDateStyle::AddMonth( sal_Bool bLongFmt, sal_Bool bTexture ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddMonthDay( sal_Bool bLongFmt ) +inline void XFDateStyle::AddMonthDay( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateMonthDay); @@ -183,7 +183,7 @@ inline void XFDateStyle::AddMonthDay( sal_Bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddWeekDay( sal_Bool bLongFmt ) +inline void XFDateStyle::AddWeekDay( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateWeekDay); @@ -198,7 +198,7 @@ inline void XFDateStyle::AddYearWeek() m_aParts.AddStyle(part); } -inline void XFDateStyle::AddEra(sal_Bool bLongFmt) +inline void XFDateStyle::AddEra(bool bLongFmt) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateEra); @@ -206,7 +206,7 @@ inline void XFDateStyle::AddEra(sal_Bool bLongFmt) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddQuarter(sal_Bool bLongFmt) +inline void XFDateStyle::AddQuarter(bool bLongFmt) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateQuarter); @@ -222,7 +222,7 @@ inline void XFDateStyle::AddText( const OUString& text ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddHour( sal_Bool bLongFmt ) +inline void XFDateStyle::AddHour( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateHour); @@ -230,7 +230,7 @@ inline void XFDateStyle::AddHour( sal_Bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddMinute( sal_Bool bLongFmt ) +inline void XFDateStyle::AddMinute( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateMinute); @@ -238,7 +238,7 @@ inline void XFDateStyle::AddMinute( sal_Bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos) +inline void XFDateStyle::AddSecond( bool bLongFmt, sal_Int16 pos) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateSecond); @@ -247,7 +247,7 @@ inline void XFDateStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddAmPm(sal_Bool /*bAmPm*/) +inline void XFDateStyle::AddAmPm(bool /*bAmPm*/) { XFDatePart *part = new XFDatePart(); part->SetPartType(enumXFDateAmPm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx index 06db32b3b23a..5b3df3f9cf58 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx @@ -121,7 +121,7 @@ public: /** * @descr decide whether it's a solid line. */ - sal_Bool IsSolid(); + bool IsSolid(); double GetWidth(); @@ -190,7 +190,7 @@ inline void XFDrawLineStyle::SetSpace(double space) m_fSpace = space; } -inline sal_Bool XFDrawLineStyle::IsSolid() +inline bool XFDrawLineStyle::IsSolid() { return (m_eLineStyle==enumXFLineSolid); } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx index ca2763b80d10..f125779b775f 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx @@ -81,7 +81,7 @@ XFDrawPath::XFDrawPath() { } -void XFDrawPath::MoveTo(XFPoint pt, sal_Bool absPosition) +void XFDrawPath::MoveTo(XFPoint pt, bool absPosition) { XFSvgPathEntry entry; @@ -93,7 +93,7 @@ void XFDrawPath::MoveTo(XFPoint pt, sal_Bool absPosition) m_aPaths.push_back(entry); } -void XFDrawPath::LineTo(XFPoint pt, sal_Bool absPosition) +void XFDrawPath::LineTo(XFPoint pt, bool absPosition) { XFSvgPathEntry entry; @@ -105,7 +105,7 @@ void XFDrawPath::LineTo(XFPoint pt, sal_Bool absPosition) m_aPaths.push_back(entry); } -void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool absPosition) +void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition) { XFSvgPathEntry entry; @@ -120,7 +120,7 @@ void XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool m_aPaths.push_back(entry); } -void XFDrawPath::ClosePath(sal_Bool absPosition) +void XFDrawPath::ClosePath(bool absPosition) { XFSvgPathEntry entry; diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx index 51859b952005..f567d902953b 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx @@ -104,22 +104,22 @@ public: /** * @descr Move command. */ - void MoveTo(XFPoint pt, sal_Bool absPosition = sal_True); + void MoveTo(XFPoint pt, bool absPosition = true); /** * @descr Line command. */ - void LineTo(XFPoint pt, sal_Bool absPosition = sal_True); + void LineTo(XFPoint pt, bool absPosition = true); /** * @descr Curve command. */ - void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool absPosition = sal_True); + void CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition = true); /** * @descr Close path command. */ - void ClosePath(sal_Bool absPosition = sal_True); + void ClosePath(bool absPosition = true); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx index db49645dda35..b23251d50766 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx @@ -75,8 +75,8 @@ XFDrawStyle::XFDrawStyle() m_fArrowStartSize = 0.3; m_fArrowEndSize = 0.3; - m_bArrowStartCenter = sal_False; - m_bArrowEndCenter = sal_False; + m_bArrowStartCenter = false; + m_bArrowEndCenter = false; } XFDrawStyle::~XFDrawStyle() diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index 1183d7ce51df..d4a921bb6b39 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -111,12 +111,12 @@ public: /** * @descr Set drawing object arrow start style,only lines can have arrows. */ - void SetArrowStart(const OUString& start, double size=0.3, sal_Bool center = sal_False); + void SetArrowStart(const OUString& start, double size=0.3, bool center = false); /** * @descr Set drawing object arrow end style,only lines can have arrows. */ - void SetArrowEnd(const OUString& end, double size=0.3, sal_Bool center = sal_False); + void SetArrowEnd(const OUString& end, double size=0.3, bool center = false); void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust); @@ -134,8 +134,8 @@ private: OUString m_strArrowEnd; double m_fArrowStartSize; double m_fArrowEndSize; - sal_Bool m_bArrowStartCenter; - sal_Bool m_bArrowEndCenter; + bool m_bArrowStartCenter; + bool m_bArrowEndCenter; }; inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) @@ -144,7 +144,7 @@ inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) m_nWrapLines = nParagraphs; } -inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, sal_Bool center) +inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, bool center) { assert(size>0); m_strArrowStart = start; @@ -152,7 +152,7 @@ inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, sal_B m_bArrowStartCenter = center; } -inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size, sal_Bool center) +inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size, bool center) { assert(size>0); m_strArrowEnd = end; diff --git a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx index 5d7167788df9..d034a9ec6dc5 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx @@ -67,8 +67,8 @@ class XFEndnoteConfig : public XFFootnoteConfig public: XFEndnoteConfig() : XFFootnoteConfig() { - m_bIsFootnote = sal_False; - m_bInsertInPage = sal_False; + m_bIsFootnote = false; + m_bInsertInPage = false; m_strDefaultStyle = "Endnote"; m_strMasterPage = "Endnote"; m_strCitationStyle = "Endnote Symbol"; diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx b/lotuswordpro/source/filter/xfilter/xfentry.cxx index efb0e8eb046d..6ca70844e7e1 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.cxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx @@ -62,7 +62,7 @@ XFEntry::XFEntry() { m_eType = enumXFEntryTOC; - m_bMainEntry = sal_False; + m_bMainEntry = false; m_nOutlineLevel = 1; } diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx index 451effb1a5b9..919d1f228014 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.hxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx @@ -100,7 +100,7 @@ public: /** * @descr Set whether it's a main entry. This is available only for enumXFEntryAlphabetical. */ - void SetMainEntry(sal_Bool main); + void SetMainEntry(bool main); /** * @descr Set outline level. This is available for enumXFEntryTOC and enumXFEntryUserIndex. @@ -116,7 +116,7 @@ private: OUString m_strKey1; OUString m_strKey2; OUString m_strName; - sal_Bool m_bMainEntry; + bool m_bMainEntry; sal_Int32 m_nOutlineLevel; }; @@ -146,7 +146,7 @@ inline void XFEntry::SetKey(const OUString& key1, const OUString& key2) m_strKey2 = key2; } -inline void XFEntry::SetMainEntry(sal_Bool main) +inline void XFEntry::SetMainEntry(bool main) { m_bMainEntry = main; } diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx index a244600d0136..031b963ac953 100644 --- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx @@ -59,7 +59,7 @@ ************************************************************************/ #include "xffloatframe.hxx" -XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all) +XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all) { m_nStart = start; m_nEnd = end; diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx index 8903f776cfd8..c921c2764dd3 100644 --- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx @@ -75,7 +75,7 @@ public: /** * @descr output range: [start,end], not [start,end). */ - XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all=sal_False); + XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all=false); public: void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -83,7 +83,7 @@ public: private: sal_Int32 m_nStart; sal_Int32 m_nEnd; - sal_Bool m_bAll; + bool m_bAll; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx index 31ae98c59a2c..9a37d5f9c85f 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.cxx +++ b/lotuswordpro/source/filter/xfilter/xffont.cxx @@ -63,28 +63,28 @@ XFFont::XFFont() : m_nFontSize(0) , m_nFontSizeAsia(0) , m_nFontSizeComplex(0) - , m_bItalic(sal_False) - , m_bItalicAsia(sal_False) - , m_bItalicComplex(sal_False) - , m_bBold(sal_False) - , m_bBoldAsia(sal_False) - , m_bBoldComplex(sal_False) + , m_bItalic(false) + , m_bItalicAsia(false) + , m_bItalicComplex(false) + , m_bBold(false) + , m_bBoldAsia(false) + , m_bBoldComplex(false) , m_eUnderline(enumXFUnderlineNone) , m_eCrossout(enumXFCrossoutNone) , m_eRelief(enumXFReliefNone) , m_eTransform(enumXFTransformNone) , m_eEmphasize(enumXFEmphasizeNone) - , m_bWordByWord(sal_False) - , m_bEmphasizeTop(sal_True) - , m_bOutline(sal_False) - , m_bShadow(sal_False) - , m_bBlink(sal_False) + , m_bWordByWord(false) + , m_bEmphasizeTop(true) + , m_bOutline(false) + , m_bShadow(false) + , m_bBlink(false) , m_nPosition(33) , m_nScale(58) , m_fCharSpace(0) , m_nWidthScale(100) , m_nFlag(0) - , m_bTransparent(sal_False) + , m_bTransparent(false) { } /* diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx index 1dd08ee60c81..999daa236d03 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.hxx +++ b/lotuswordpro/source/filter/xfilter/xffont.hxx @@ -150,37 +150,37 @@ public: /** * @descr Set whether font is italic. */ - void SetItalic(sal_Bool italic = true); + void SetItalic(bool italic = true); /** * @descr Set whether font is italic for asia locale. */ - void SetItalicAsia(sal_Bool italic); + void SetItalicAsia(bool italic); /** * @descr Set whether font is italic for BIDI locale. */ - void SetItalicComplex(sal_Bool italic); + void SetItalicComplex(bool italic); /** * @descr Set font bold. */ - void SetBold(sal_Bool bold = true); + void SetBold(bool bold = true); /** * @descr Set font bold for asia locale. */ - void SetBoldAsia(sal_Bool bold); + void SetBoldAsia(bool bold); /** * @descr Set font bold for complex locale. */ - void SetBoldComplex(sal_Bool bold); + void SetBoldComplex(bool bold); /** * @descr Set underline style. */ - void SetUnderline(enumXFUnderline underline,sal_Bool wordByWord=sal_False); + void SetUnderline(enumXFUnderline underline,bool wordByWord=false); /** * @descr Set underline color. @@ -190,7 +190,7 @@ public: /** * @descr Set crossout. */ - void SetCrossout(enumXFCrossout cross,sal_Bool wordByWord=sal_False); + void SetCrossout(enumXFCrossout cross,bool wordByWord=false); /** * @descr Set font relief. @@ -205,27 +205,27 @@ public: /** * @descr Set font emphasize effect. */ - void SetEmphasize(enumXFEmphasize emphasize, sal_Bool top = sal_True); + void SetEmphasize(enumXFEmphasize emphasize, bool top = true); /** * @descr Set outline effect. */ - void SetOutline(sal_Bool outline); + void SetOutline(bool outline); /** * @descr Set font shadow. */ - void SetShadow(sal_Bool shadow); + void SetShadow(bool shadow); /** * @descr Set font blink effect. */ - void SetBlink(sal_Bool blink); + void SetBlink(bool blink); /** * @descr Set upper script or lower script. */ - void SetPosition(sal_Bool bUpperScript = sal_True, sal_Int16 pos = 33, sal_Int16 scale = 58); + void SetPosition(bool bUpperScript = true, sal_Int16 pos = 33, sal_Int16 scale = 58); /** * @descr Set space between chars in percent. @@ -268,12 +268,12 @@ private: sal_Int16 m_nFontSize; sal_Int16 m_nFontSizeAsia; sal_Int16 m_nFontSizeComplex; - sal_Bool m_bItalic; - sal_Bool m_bItalicAsia; - sal_Bool m_bItalicComplex; - sal_Bool m_bBold; - sal_Bool m_bBoldAsia; - sal_Bool m_bBoldComplex; + bool m_bItalic; + bool m_bItalicAsia; + bool m_bItalicComplex; + bool m_bBold; + bool m_bBoldAsia; + bool m_bBoldComplex; XFColor m_aUnderlineColor; enumXFUnderline m_eUnderline; @@ -281,11 +281,11 @@ private: enumXFRelief m_eRelief; enumXFTransform m_eTransform; enumXFEmphasize m_eEmphasize; - sal_Bool m_bWordByWord; - sal_Bool m_bEmphasizeTop; - sal_Bool m_bOutline; - sal_Bool m_bShadow; - sal_Bool m_bBlink; + bool m_bWordByWord; + bool m_bEmphasizeTop; + bool m_bOutline; + bool m_bShadow; + bool m_bBlink; sal_Int16 m_nPosition; sal_Int16 m_nScale; double m_fCharSpace; @@ -294,7 +294,7 @@ private: XFColor m_aBackColor; //The flag defines which variable will be funtional. sal_uInt32 m_nFlag; - sal_Bool m_bTransparent; + bool m_bTransparent; }; inline void XFFont::SetFontName(const OUString& name) @@ -340,7 +340,7 @@ inline void XFFont::SetFontSizeComplex(sal_Int16 size) } //---------Italic: -inline void XFFont::SetItalic(sal_Bool italic) +inline void XFFont::SetItalic(bool italic) { m_bItalic = italic; m_nFlag |= XFFONT_FLAG_ITALIC; @@ -349,20 +349,20 @@ inline void XFFont::SetItalic(sal_Bool italic) SetItalicComplex(italic); } -inline void XFFont::SetItalicAsia(sal_Bool italic) +inline void XFFont::SetItalicAsia(bool italic) { m_bItalicAsia = italic; m_nFlag |= XFFONT_FLAG_ITALIC_ASIA; } -inline void XFFont::SetItalicComplex(sal_Bool italic) +inline void XFFont::SetItalicComplex(bool italic) { m_bItalicComplex = italic; m_nFlag |= XFFONT_FLAG_ITALIC_COMPLEX; } //--------Bold -inline void XFFont::SetBold(sal_Bool bold) +inline void XFFont::SetBold(bool bold) { m_bBold = bold; m_nFlag |= XFFONT_FLAG_BOLD; @@ -370,20 +370,20 @@ inline void XFFont::SetBold(sal_Bool bold) SetBoldComplex(bold); } -inline void XFFont::SetBoldAsia(sal_Bool bold) +inline void XFFont::SetBoldAsia(bool bold) { m_bBoldAsia = bold; m_nFlag |= XFFONT_FLAG_BOLD_ASIA; } -inline void XFFont::SetBoldComplex(sal_Bool bold) +inline void XFFont::SetBoldComplex(bool bold) { m_bBoldComplex = bold; m_nFlag |= XFFONT_FLAG_BOLD_COMPLEX; } //--------Underline: -inline void XFFont::SetUnderline(enumXFUnderline underline, sal_Bool wordByWord) +inline void XFFont::SetUnderline(enumXFUnderline underline, bool wordByWord) { m_eUnderline = underline; m_bWordByWord = wordByWord; @@ -396,7 +396,7 @@ inline void XFFont::SetUnderlineColor(XFColor color) m_nFlag |= XFFONT_FLAG_UNDERLINECOLOR; } -inline void XFFont::SetCrossout(enumXFCrossout cross, sal_Bool wordByWord) +inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord) { m_eCrossout = cross; m_bWordByWord = wordByWord; @@ -413,29 +413,29 @@ inline void XFFont::SetTransform(enumXFTransform transform) m_nFlag |= XFFONT_FLAG_TRANSFORM; } -inline void XFFont::SetEmphasize(enumXFEmphasize emphasize, sal_Bool top) +inline void XFFont::SetEmphasize(enumXFEmphasize emphasize, bool top) { m_eEmphasize = emphasize; m_bEmphasizeTop = top; m_nFlag |= XFFONT_FLAG_EMPHASIZE; } -inline void XFFont::SetOutline(sal_Bool outline) +inline void XFFont::SetOutline(bool outline) { m_bOutline = outline; m_nFlag |= XFFONT_FLAG_OUTLINE; } -inline void XFFont::SetShadow(sal_Bool shadow) +inline void XFFont::SetShadow(bool shadow) { m_bShadow = shadow; m_nFlag |= XFFONT_FLAG_SHADOW; } -inline void XFFont::SetBlink(sal_Bool blink) +inline void XFFont::SetBlink(bool blink) { m_bBlink = blink; m_nFlag |= XFFONT_FLAG_BLINK; } -inline void XFFont::SetPosition(sal_Bool bUpperScript, sal_Int16 pos, sal_Int16 scale) +inline void XFFont::SetPosition(bool bUpperScript, sal_Int16 pos, sal_Int16 scale) { assert(pos>=0&&pos<=100); assert(scale>0&&scale<=100); @@ -474,14 +474,14 @@ inline void XFFont::SetColor(XFColor& color) inline void XFFont::SetBackColor(XFColor& color) { - m_bTransparent = sal_False; + m_bTransparent = false; m_nFlag |= XFFONT_FLAG_BGCOLOR; m_aBackColor = color; } inline void XFFont::SetBackColorTransparent() { - m_bTransparent = sal_True; + m_bTransparent = true; m_nFlag |= XFFONT_FLAG_BGCOLOR; } diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index c2c64cab501e..4b5115d1da85 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -59,7 +59,7 @@ ************************************************************************/ #include "xffontdecl.hxx" -XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, sal_Bool fixed) +XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, bool fixed) { m_strFontName = name; m_strFontFamily = family; @@ -76,7 +76,7 @@ OUString XFFontDecl::GetFontFamily() return m_strFontFamily; } -sal_Bool XFFontDecl::GetFontPitchFixed() +bool XFFontDecl::GetFontPitchFixed() { return m_bPitchFixed; } diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx index 8b28f65817e2..eb69e138e8de 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx @@ -71,7 +71,7 @@ class XFFontDecl { public: - XFFontDecl(const OUString& name, const OUString& family, sal_Bool fixed = false); + XFFontDecl(const OUString& name, const OUString& family, bool fixed = false); public: /** @@ -84,12 +84,12 @@ public: */ OUString GetFontFamily(); - sal_Bool GetFontPitchFixed(); + bool GetFontPitchFixed(); private: OUString m_strFontName; OUString m_strFontFamily; - sal_Bool m_bPitchFixed; + bool m_bPitchFixed; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx index 5ef92e16c56c..97b97fad4123 100644 --- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx @@ -67,7 +67,7 @@ class XFFontWorkStyle public: XFFontWorkStyle() : m_nButtonForm(-1), - m_bHideForm(sal_True), + m_bHideForm(true), m_fDistance(-0.10), m_eStyleType(enumXFFWOff), m_eAdjustType(enumXFFWAdjustAutosize), @@ -77,7 +77,7 @@ public: ~XFFontWorkStyle(){} inline void SetButtonForm(sal_Int8 nIndex); - inline void SetHideForm(sal_Bool bHide); + inline void SetHideForm(bool bHide); inline void SetFWDistance(double fDist); inline void SetFWStyleType(enumXFFWStyle eStyle); inline void SetFWAdjustType(enumXFFWAdjust eAdjust); @@ -91,7 +91,7 @@ public: private: sal_Int8 m_nButtonForm; - sal_Bool m_bHideForm; + bool m_bHideForm; double m_fDistance; enumXFFWStyle m_eStyleType; enumXFFWAdjust m_eAdjustType; @@ -103,7 +103,7 @@ inline void XFFontWorkStyle::SetButtonForm(sal_Int8 nIndex) m_nButtonForm = nIndex; } -inline void XFFontWorkStyle::SetHideForm(sal_Bool bHide) +inline void XFFontWorkStyle::SetHideForm(bool bHide) { m_bHideForm = bHide; } diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx index e9babde27227..c8cb895e13e9 100644 --- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx @@ -66,7 +66,7 @@ class XFFooterStyle : public XFHeaderStyle { public: - XFFooterStyle() : XFHeaderStyle(sal_True) + XFFooterStyle() : XFHeaderStyle(true) { } diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx index 96b674e47c9c..dfb9cac31fb7 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx @@ -84,7 +84,7 @@ public: void SetRestartOnChapter(); - void SetInsertInPage(sal_Bool page=sal_True); + void SetInsertInPage(bool page=true); void SetNumPrefix(const OUString& numprefix); @@ -108,8 +108,8 @@ protected: OUString m_strMessageOn; sal_Int32 m_nStartValue; sal_Int32 m_nRestartType; - sal_Bool m_bInsertInPage; - sal_Bool m_bIsFootnote; + bool m_bInsertInPage; + bool m_bIsFootnote; }; inline XFFootnoteConfig::XFFootnoteConfig() @@ -117,12 +117,12 @@ inline XFFootnoteConfig::XFFootnoteConfig() m_nStartValue = 0; m_nRestartType = -1; m_strNumFmt = "1"; - m_bInsertInPage = sal_True; + m_bInsertInPage = true; m_strDefaultStyle = "Footnote"; m_strMasterPage = "Footnote"; m_strCitationStyle = "Footnote Symbol"; m_strBodyStyle = "Footnote anchor"; - m_bIsFootnote = sal_True; + m_bIsFootnote = true; } inline void XFFootnoteConfig::SetBodyStyle(const OUString& style) @@ -167,7 +167,7 @@ inline void XFFootnoteConfig::SetRestartOnChapter() m_nRestartType = 1; } -inline void XFFootnoteConfig::SetInsertInPage(sal_Bool page) +inline void XFFootnoteConfig::SetInsertInPage(bool page) { m_bInsertInPage = page; } diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index 3398533641fb..73abd6ce4335 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -62,7 +62,7 @@ #define ZINDEX_MIN 0 XFFrame::XFFrame() { - m_isTextBox = sal_False; + m_isTextBox = false; m_eAnchor = enumXFAnchorPara; m_nAnchorPage = 0; m_nZIndex = ZINDEX_MIN; @@ -73,7 +73,7 @@ XFFrame::XFFrame() m_nFlag = 0; m_eType = enumXFFrameTextbox; } -XFFrame::XFFrame(sal_Bool isTextBox):m_isTextBox(isTextBox) +XFFrame::XFFrame(bool isTextBox):m_isTextBox(isTextBox) { m_eAnchor = enumXFAnchorPara; m_nAnchorPage = 0; @@ -141,7 +141,7 @@ void XFFrame::StartFrame(IXFStream *pStrm) pAttrList->AddAttribute( "draw:style-name", GetStyleName() ); assert(!m_strName.isEmpty()); //name should not be null. - if( !m_strName.isEmpty() && m_isTextBox == sal_False) + if( !m_strName.isEmpty() && m_isTextBox == false) pAttrList->AddAttribute( "draw:name", m_strName ); //anchor type: switch( m_eAnchor ) diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index 0cae4304cd82..04eed863daf1 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -80,7 +80,7 @@ class XFFrame : public XFContentContainer { public: XFFrame(); - XFFrame(sal_Bool isTextBox); + XFFrame(bool isTextBox); virtual ~XFFrame(); @@ -189,7 +189,7 @@ protected: OUString m_strNextLink; enumXFFrameType m_eType; sal_uInt32 m_nFlag; - sal_Bool m_isTextBox; + bool m_isTextBox; }; inline void XFFrame::SetAnchorType(enumXFAnchor anchor) diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index 61169ef24d9f..a0b485b002f6 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -72,12 +72,12 @@ XFFrameStyle::XFFrameStyle() m_pShadow = NULL; m_pBGImage = NULL; - m_bProtectContent = sal_False; - m_bProtectSize = sal_False; - m_bProtectPos = sal_False; - m_bEditable = sal_False; - m_bPrintable = sal_True; - m_bBackground = sal_False; + m_bProtectContent = false; + m_bProtectSize = false; + m_bProtectPos = false; + m_bEditable = false; + m_bPrintable = true; + m_bBackground = false; m_nTransparency = 0; m_eTextDir = enumXFTextDirNone; diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index 9224af8f1141..c7d8c804fc35 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -124,7 +124,7 @@ public: /** * @descr Set whether frame is protected. There are three properties that can be protected, content,size and position. */ - void SetProtect(sal_Bool content, sal_Bool size, sal_Bool pos); + void SetProtect(bool content, bool size, bool pos); /** * @descr Set text dir. @@ -144,7 +144,7 @@ public: /** * @descr Set frame background. */ - void SetBackGround(sal_Bool bBackground); + void SetBackGround(bool bBackground); void SetTransparency(sal_Int16 nTransparency); @@ -162,12 +162,12 @@ protected: XFShadow *m_pShadow; XFBGImage *m_pBGImage; XFColor m_aBackColor; - sal_Bool m_bProtectContent; - sal_Bool m_bProtectSize; - sal_Bool m_bProtectPos; - sal_Bool m_bEditable; - sal_Bool m_bPrintable; - sal_Bool m_bBackground; + bool m_bProtectContent; + bool m_bProtectSize; + bool m_bProtectPos; + bool m_bEditable; + bool m_bPrintable; + bool m_bBackground; sal_Int16 m_nTransparency; enumXFTextDir m_eTextDir; @@ -216,7 +216,7 @@ inline void XFFrameStyle::SetTextDir(enumXFTextDir dir) m_eTextDir = dir; } -inline void XFFrameStyle::SetProtect(sal_Bool content, sal_Bool size, sal_Bool pos) +inline void XFFrameStyle::SetProtect(bool content, bool size, bool pos) { m_bProtectContent = content; m_bProtectSize = size; @@ -235,7 +235,7 @@ inline void XFFrameStyle::SetYPosType(enumXFFrameYPos pos, enumXFFrameYRel rel) m_eYRel = rel; } -inline void XFFrameStyle::SetBackGround(sal_Bool bBackground) +inline void XFFrameStyle::SetBackGround(bool bBackground) { m_bBackground = bBackground; } diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx index d91159324297..10345c886d83 100644 --- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx @@ -60,10 +60,10 @@ #include "xfheaderstyle.hxx" #include "xfbgimage.hxx" -XFHeaderStyle::XFHeaderStyle(sal_Bool isFooter) +XFHeaderStyle::XFHeaderStyle(bool isFooter) { m_bIsFooter = isFooter; - m_bDynamicSpace = sal_True; + m_bDynamicSpace = true; m_fHeight = -1; m_fMinHeight = -1; m_pBorders = NULL; @@ -90,7 +90,7 @@ void XFHeaderStyle::SetMargins(double left, double right, double bottom) if( bottom != -1 ) m_aMargin.SetBottom(bottom); } -void XFHeaderStyle::SetDynamicSpace(sal_Bool dynamic) +void XFHeaderStyle::SetDynamicSpace(bool dynamic) { m_bDynamicSpace = dynamic; } diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx index c6a393fbf978..715afe60aac3 100644 --- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx @@ -74,7 +74,7 @@ class XFBGImage; class XFHeaderStyle : public XFStyle { public: - explicit XFHeaderStyle(sal_Bool isFooter=sal_False); + explicit XFHeaderStyle(bool isFooter=false); virtual ~XFHeaderStyle(); @@ -84,7 +84,7 @@ public: */ void SetMargins(double left = -1, double right = -1, double bottom = -1); - void SetDynamicSpace(sal_Bool dynamic); + void SetDynamicSpace(bool dynamic); /** * @descr Set header fixed height. @@ -119,8 +119,8 @@ public: virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; protected: - sal_Bool m_bIsFooter; - sal_Bool m_bDynamicSpace; + bool m_bIsFooter; + bool m_bDynamicSpace; double m_fHeight; double m_fMinHeight; XFMargins m_aMargin; diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx index d2300bee56d4..6315833c4043 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx @@ -60,7 +60,7 @@ #include "xfimage.hxx" #include "xfbase64.hxx" -XFImage::XFImage() : m_bUseLink(sal_False) +XFImage::XFImage() : m_bUseLink(false) { m_eType = enumXFFrameImage; m_strName = XFGlobal::GenImageName(); @@ -69,13 +69,13 @@ XFImage::XFImage() : m_bUseLink(sal_False) void XFImage::SetFileURL(const OUString& url) { m_strImageFile = url; - m_bUseLink = sal_True; + m_bUseLink = true; } void XFImage::SetImageData(sal_uInt8 *buf, int len) { m_strData = XFBase64::Encode(buf, len); - m_bUseLink = sal_False; + m_bUseLink = false; } /* diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx index 060cc10a34e6..841c46243c04 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx @@ -91,7 +91,7 @@ public: private: OUString m_strImageFile; OUString m_strData; - sal_Bool m_bUseLink; + bool m_bUseLink; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx index 93a64563743f..4cdfd2f7daf5 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx @@ -74,8 +74,8 @@ XFImageStyle::XFImageStyle() m_fClipRight = 0; m_fClipTop = 0; m_fClipBottom = 0; - m_bHoriFlip = sal_False; - m_bVertFlip = sal_False; + m_bHoriFlip = false; + m_bVertFlip = false; m_eColorMode = enumXFColorStandard; } diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx index 3f3bcb64c21c..8bf18b350678 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx @@ -85,7 +85,7 @@ public: void SetClip(double left, double right, double top, double bottom); - void SetFlip(sal_Bool hori, sal_Bool vert); + void SetFlip(bool hori, bool vert); void SetColorMode(enumXFColorMode mode); @@ -103,8 +103,8 @@ private: double m_fClipRight; double m_fClipTop; double m_fClipBottom; - sal_Bool m_bHoriFlip; - sal_Bool m_bVertFlip; + bool m_bHoriFlip; + bool m_bVertFlip; enumXFColorMode m_eColorMode; }; @@ -151,7 +151,7 @@ inline void XFImageStyle::SetClip(double left, double right, double top, double m_fClipBottom = bottom; } -inline void XFImageStyle::SetFlip(sal_Bool hori, sal_Bool vert) +inline void XFImageStyle::SetFlip(bool hori, bool vert) { m_bHoriFlip = hori; m_bVertFlip = vert; diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index a4a369986bf0..40d64feefd9b 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -102,12 +102,12 @@ void XFIndex::AddTemplate(const OUString& level, const OUString& style, XFInd m_aTemplates.push_back( templ ); } -void XFIndex::SetProtected(sal_Bool protect) +void XFIndex::SetProtected(bool protect) { m_bProtect = protect; } -void XFIndex::SetSeparator(sal_Bool sep) +void XFIndex::SetSeparator(bool sep) { m_bSeparator = sep; } diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index 33860e590934..07de00f5145e 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -158,12 +158,12 @@ public: /** * @descr Set if protected index to prevent handly-revise. */ - void SetProtected(sal_Bool protect); + void SetProtected(bool protect); /** * @descr Set separator. */ - void SetSeparator(sal_Bool sep); + void SetSeparator(bool sep); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index 6795a90595f7..d81674f67ff0 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -80,11 +80,11 @@ public: void SetTextStyle(const OUString& style); - void SetRestartOnPage(sal_Bool restart = sal_True); + void SetRestartOnPage(bool restart = true); - void SetCountEmptyLines(sal_Bool empty = sal_True); + void SetCountEmptyLines(bool empty = true); - void SetCountFrameLines(sal_Bool frame = sal_True); + void SetCountFrameLines(bool frame = true); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -96,9 +96,9 @@ private: OUString m_strSeparator; OUString m_strNumFmt; OUString m_strTextStyle; - sal_Bool m_bRestartOnPage; - sal_Bool m_bCountEmptyLines; - sal_Bool m_bCountFrameLines; + bool m_bRestartOnPage; + bool m_bCountEmptyLines; + bool m_bCountFrameLines; }; inline XFLineNumberConfig::XFLineNumberConfig() @@ -107,9 +107,9 @@ inline XFLineNumberConfig::XFLineNumberConfig() m_fOffset = 0; m_nIncrement = 5; m_nSepIncrement = 3; - m_bRestartOnPage = sal_False; - m_bCountEmptyLines = sal_True; - m_bCountFrameLines = sal_False; + m_bRestartOnPage = false; + m_bCountEmptyLines = true; + m_bCountFrameLines = false; } inline void XFLineNumberConfig::SetNumberOffset(double offset) @@ -143,17 +143,17 @@ inline void XFLineNumberConfig::SetTextStyle(const OUString& style) m_strTextStyle = style; } -inline void XFLineNumberConfig::SetRestartOnPage(sal_Bool restart) +inline void XFLineNumberConfig::SetRestartOnPage(bool restart) { m_bRestartOnPage = restart; } -inline void XFLineNumberConfig::SetCountEmptyLines(sal_Bool empty) +inline void XFLineNumberConfig::SetCountEmptyLines(bool empty) { m_bCountEmptyLines = empty; } -inline void XFLineNumberConfig::SetCountFrameLines(sal_Bool frame) +inline void XFLineNumberConfig::SetCountFrameLines(bool frame) { m_bCountFrameLines = frame; } diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx index d72f8f168286..dde731d27bf7 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.cxx +++ b/lotuswordpro/source/filter/xfilter/xflist.cxx @@ -64,8 +64,8 @@ XFList::XFList() { - m_bOrdered = sal_True; - m_bContinueNumber = sal_False; + m_bOrdered = true; + m_bContinueNumber = false; m_pHeader = NULL; } diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx index 03501a2ded1f..fc6ecac80a67 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.hxx +++ b/lotuswordpro/source/filter/xfilter/xflist.hxx @@ -80,12 +80,12 @@ public: /** * @descr Set whether it's an ordered list or an unordered list. */ - void SetOrdered(sal_Bool ordered); + void SetOrdered(bool ordered); /** * @descr Set whether to continue to number list. */ - void SetContinueNumber(sal_Bool bContinueNumber=sal_False); + void SetContinueNumber(bool bContinueNumber=false); /** * @descr Output list object. @@ -97,8 +97,8 @@ public: virtual void EndList(IXFStream *pStrm); private: - sal_Bool m_bOrdered; - sal_Bool m_bContinueNumber; + bool m_bOrdered; + bool m_bContinueNumber; XFListItem *m_pHeader; }; @@ -108,7 +108,7 @@ class XFUnorderedList : public XFList public: XFUnorderedList() { - SetOrdered(sal_False); + SetOrdered(false); } }; @@ -117,16 +117,16 @@ class XFOrderedList : public XFList public: XFOrderedList() { - SetOrdered(sal_True); + SetOrdered(true); } }; -inline void XFList::SetOrdered(sal_Bool ordered) +inline void XFList::SetOrdered(bool ordered) { m_bOrdered = ordered; } -inline void XFList::SetContinueNumber(sal_Bool bContinueNumber) +inline void XFList::SetContinueNumber(bool bContinueNumber) { m_bContinueNumber = bContinueNumber; } diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx index 7bcb17e77959..25b318dfdb64 100644 --- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx +++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx @@ -70,20 +70,20 @@ public: XFListItem(); public: - void SetIsHeader(sal_Bool isHeader=sal_True); + void SetIsHeader(bool isHeader=true); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: - sal_Bool m_bIsHeader; + bool m_bIsHeader; }; inline XFListItem::XFListItem() { - m_bIsHeader = sal_False; + m_bIsHeader = false; } -inline void XFListItem::SetIsHeader(sal_Bool isHeader) +inline void XFListItem::SetIsHeader(bool isHeader) { m_bIsHeader = isHeader; } diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx index a3ceea05f230..fd97d5ca918b 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx @@ -65,9 +65,9 @@ XFNumberStyle::XFNumberStyle():m_aColor(0,0,0),m_aNegativeColor(255,0,0) m_nDecimalDigits = 0; m_nMinInteger = 1; m_nMinExponent = 2; - m_bGroup = sal_False; - m_bRedIfNegative = sal_False; - m_bCurrencySymbolPost = sal_False; + m_bGroup = false; + m_bRedIfNegative = false; + m_bCurrencySymbolPost = false; } enumXFStyle XFNumberStyle::GetStyleFamily() @@ -75,54 +75,54 @@ enumXFStyle XFNumberStyle::GetStyleFamily() return enumXFStyleNumber; } -sal_Bool XFNumberStyle::Equal(IXFStyle *pStyle) +bool XFNumberStyle::Equal(IXFStyle *pStyle) { if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleNumber ) - return sal_False; + return false; XFNumberStyle *pOther = (XFNumberStyle*)pStyle; if( !pOther ) - return sal_False; + return false; if( m_eType != pOther->m_eType ) - return sal_False; + return false; if( m_nDecimalDigits != pOther->m_nDecimalDigits ) - return sal_False; + return false; if( m_nMinInteger != pOther->m_nMinInteger ) - return sal_False; + return false; if( m_bRedIfNegative != pOther->m_bRedIfNegative ) - return sal_False; + return false; if( m_bGroup != pOther->m_bGroup ) - return sal_False; + return false; if( m_aColor != pOther->m_aColor ) - return sal_False; + return false; if( m_strPrefix != pOther->m_strPrefix ) - return sal_False; + return false; if( m_strSuffix != pOther->m_strSuffix ) - return sal_False; + return false; //When category of number format is scientific, the number can not be displayed normally in table. if ( m_nMinExponent != pOther->m_nMinExponent ) - return sal_False; + return false; if( m_bRedIfNegative ) { if( m_aNegativeColor != pOther->m_aNegativeColor ) - return sal_False; + return false; if( m_strNegativePrefix != pOther->m_strNegativePrefix ) - return sal_False; + return false; if( m_strNegativeSuffix != pOther->m_strNegativeSuffix ) - return sal_False; + return false; } if( m_eType == enuMXFNumberCurrency ) { if( m_bCurrencySymbolPost != pOther->m_bCurrencySymbolPost ) - return sal_False; + return false; if( m_strCurrencySymbol != pOther->m_strCurrencySymbol ) - return sal_False; + return false; } - return sal_True; + return true; } void XFNumberStyle::ToXml(IXFStream *pStrm) @@ -218,7 +218,7 @@ void XFNumberStyle::ToXml_Normal(IXFStream *pStrm) { ToXml_StartElement(pStrm); - ToXml_Content(pStrm,sal_False); + ToXml_Content(pStrm,false); ToXml_EndElement(pStrm); } @@ -237,7 +237,7 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm) ToXml_StartElement(pStrm); - ToXml_Content(pStrm,sal_True); + ToXml_Content(pStrm,true); pAttrList->Clear(); pAttrList->AddAttribute( "style:condition", "value()>=0" ); @@ -248,7 +248,7 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm) ToXml_EndElement(pStrm); } -void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive) +void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive) { IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx index 3176f13491aa..739c1a31036d 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx @@ -77,7 +77,7 @@ public: void SetMinExponent(sal_Int32 exponent); - void SetGroup(sal_Bool group = sal_True); + void SetGroup(bool group = true); void SetColor(const XFColor& color); XFColor GetColor(){return m_aColor;} @@ -90,11 +90,11 @@ public: void SetNumberType(enumXFNumberType type); - void SetCurrencySymbol(sal_Bool post, const OUString& symbol, sal_Bool bShowSpace=sal_False); + void SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace=false); virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -107,21 +107,21 @@ protected: void ToXml_Negative(IXFStream *pStrm); - void ToXml_Content(IXFStream *pStrm, sal_Bool nagetive); + void ToXml_Content(IXFStream *pStrm, bool nagetive); protected: enumXFNumberType m_eType; sal_Int32 m_nDecimalDigits; sal_Int32 m_nMinInteger; sal_Int32 m_nMinExponent; - sal_Bool m_bGroup; + bool m_bGroup; XFColor m_aColor; - sal_Bool m_bCurrencySymbolPost; + bool m_bCurrencySymbolPost; OUString m_strCurrencySymbol; OUString m_strPrefix; OUString m_strSuffix; - sal_Bool m_bRedIfNegative; + bool m_bRedIfNegative; XFColor m_aNegativeColor; OUString m_strNegativePrefix; OUString m_strNegativeSuffix; @@ -144,13 +144,13 @@ inline void XFNumberStyle::SetMinExponent(sal_Int32 exponent) inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUString& suffix, const XFColor& color) { - m_bRedIfNegative = sal_True; + m_bRedIfNegative = true; m_aNegativeColor = color; m_strNegativePrefix = prefix; m_strNegativeSuffix = suffix; } -inline void XFNumberStyle::SetGroup(sal_Bool group) +inline void XFNumberStyle::SetGroup(bool group) { m_bGroup = group; } @@ -175,7 +175,7 @@ inline void XFNumberStyle::SetSurfix(const OUString& surfix) m_strSuffix = surfix; } -inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, const OUString& symbol, sal_Bool bShowSpace) +inline void XFNumberStyle::SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace) { m_bCurrencySymbolPost = post; m_strCurrencySymbol = symbol; diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx index f37050278ff3..dcf78947de67 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx @@ -69,7 +69,7 @@ #include "xfbgimage.hxx" XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone), -m_eTextDir(enumXFTextDirNone), m_bPrintOrient(sal_True), m_pBorders(NULL), m_pShadow(NULL), +m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(NULL), m_pShadow(NULL), m_pColumns(NULL), m_pBGImage(NULL), m_pHeaderStyle(NULL), m_pFooterStyle(NULL), m_eSepAlign(enumXFAlignNone), m_fSepWidth(0), m_aSepColor(0), m_fSepSpaceAbove(0), m_fSepSpaceBelow(0), m_nSepLengthPercent(0) diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx index d8e8d465b671..3788d08afb27 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx @@ -89,7 +89,7 @@ public: void SetPageUsage(enumXFPageUsage usage); - void SetPrintOrient(sal_Bool bUseWidth=sal_True); + void SetPrintOrient(bool bUseWidth=true); void SetBorders(XFBorders *pBorders); @@ -127,7 +127,7 @@ private: enumXFPageUsage m_eUsage; enumXFTextDir m_eTextDir; - sal_Bool m_bPrintOrient; + bool m_bPrintOrient; XFBorders *m_pBorders; XFShadow *m_pShadow; @@ -152,7 +152,7 @@ inline void XFPageMaster::SetPageUsage(enumXFPageUsage usage) this->m_eUsage = usage; } -inline void XFPageMaster::SetPrintOrient(sal_Bool bUseWidth) +inline void XFPageMaster::SetPrintOrient(bool bUseWidth) { m_bPrintOrient = bUseWidth; } diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx index eea2457c42de..cc2856a40ab7 100644 --- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx @@ -100,7 +100,7 @@ void XFParagraph::ToXml(IXFStream *pStrm) pStrm->EndElement( "text:p" ); } -sal_Bool XFParagraph::HasContents() +bool XFParagraph::HasContents() { return GetCount()>0; } diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx index 5821c6c5be8f..7c154d34022a 100644 --- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx @@ -79,7 +79,7 @@ public: virtual ~XFParagraph(); public: - sal_Bool HasContents(); + bool HasContents(); virtual enumXFContent GetContentType() SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index 6b943376e39b..4b6335e66ca5 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -68,17 +68,17 @@ XFParaStyle::XFParaStyle() : m_eAlignType(enumXFAlignNone) , m_eLastLineAlign(enumXFAlignNone) - , m_bJustSingleWord(sal_False) - , m_bKeepWithNext(sal_False) + , m_bJustSingleWord(false) + , m_bKeepWithNext(false) , m_fTextIndent(0) , m_pFont(NULL) , m_pBorders(NULL) , m_pBGImage(NULL) , m_nPageNumber(0) - , m_bNumberLines(sal_True) + , m_bNumberLines(true) , m_nLineNumberRestart(0) , m_nFlag(0) - , m_bNumberRight(sal_False) + , m_bNumberRight(false) { } @@ -302,102 +302,102 @@ void XFParaStyle::AddTabStyle(enumXFTab type, double len, sal_Unicode leader, /** *Affirm whether two XFParaStyle objects are equal. */ -sal_Bool XFParaStyle::Equal(IXFStyle *pStyle) +bool XFParaStyle::Equal(IXFStyle *pStyle) { if( this == pStyle ) - return sal_True; + return true; if( !pStyle || pStyle->GetStyleFamily() != enumXFStylePara ) - return sal_False; + return false; XFParaStyle *pOther = (XFParaStyle*)(pStyle); if( !pOther ) - return sal_False; + return false; if( m_nFlag != pOther->m_nFlag ) - return sal_False; + return false; if( m_strParentStyleName != pOther->m_strParentStyleName ) - return sal_False; + return false; if( m_strMasterPage != pOther->m_strMasterPage ) - return sal_False; + return false; if( m_fTextIndent != pOther->m_fTextIndent ) - return sal_False; + return false; if( m_bJustSingleWord != pOther->m_bJustSingleWord ) - return sal_False; + return false; if( m_bKeepWithNext != pOther->m_bKeepWithNext ) - return sal_False; + return false; //line number: if( m_bNumberLines != pOther->m_bNumberLines ) - return sal_False; + return false; if( m_nLineNumberRestart != pOther->m_nLineNumberRestart ) - return sal_False; + return false; //align: if( m_eAlignType != pOther->m_eAlignType ) - return sal_False; + return false; //last line align: if( m_eLastLineAlign != pOther->m_eLastLineAlign ) - return sal_False; + return false; //shadow: if( m_aShadow != pOther->m_aShadow ) - return sal_False; + return false; //margin: if( m_aMargin != pOther->m_aMargin ) - return sal_False; + return false; if( m_aPadding != pOther->m_aPadding ) - return sal_False; + return false; //dropcap: if( m_aDropcap != pOther->m_aDropcap ) - return sal_False; + return false; //line height: if( m_aLineHeight != pOther->m_aLineHeight ) - return sal_False; + return false; //breaks: if( m_aBreaks != pOther->m_aBreaks ) - return sal_False; + return false; if( m_nPageNumber != pOther->m_nPageNumber ) - return sal_False; + return false; if( m_aTabs != pOther->m_aTabs ) - return sal_False; + return false; //font: if( m_pFont ) { if( !pOther->m_pFont ) - return sal_False; + return false; if(*m_pFont != *pOther->m_pFont ) - return sal_False; + return false; } else if( pOther->m_pFont ) - return sal_False; + return false; //border: if( m_pBorders ) { if( !pOther->m_pBorders ) - return sal_False; + return false; if( *m_pBorders != *pOther->m_pBorders ) - return sal_False; + return false; } else if( pOther->m_pBorders ) - return sal_False; + return false; if( m_pBGImage ) { if( !pOther->m_pBGImage ) - return sal_False; + return false; if( *m_pBGImage != *pOther->m_pBGImage ) - return sal_False; + return false; } else if( pOther->m_pBGImage ) - return sal_False;//add end + return false;//add end //number right if ( m_bNumberRight != pOther->m_bNumberRight) - return sal_False; + return false; - return sal_True; + return true; } void XFParaStyle::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 766f402bd5a3..29a13b38db36 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -127,7 +127,7 @@ public: /** * @descr Set line number style. */ - void SetLineNumber(sal_Bool show, sal_Int32 restart=1); + void SetLineNumber(bool show, sal_Int32 restart=1); /** * @descr Set the pading of the paragraph.This is the distance between the border and the top of the text. @@ -156,7 +156,7 @@ public: eJustSingleWord If chars of the last-line'word should be stretched. */ - void SetLastLineAlign(enumXFAlignType align,sal_Bool bJustSingleWord = sal_False); + void SetLastLineAlign(enumXFAlignType align,bool bJustSingleWord = false); /** * @descr Set the shadow of the paragraph.there is 4 postions, you @@ -225,7 +225,7 @@ public: * descr set the paragraph to be in the same page with the next paragraph. * If that can't be insured,the paragraph will start with a new page. */ - void SetKeepWithNext(sal_Bool keepWithNext); + void SetKeepWithNext(bool keepWithNext); sal_uInt32 GetFlag(){ return m_nFlag; } @@ -233,19 +233,19 @@ public: virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; virtual void ToXml(IXFStream *strm) SAL_OVERRIDE; - void SetNumberRight(sal_Bool bFlag){m_bNumberRight = bFlag;} - sal_Bool GetNumberRight(){return m_bNumberRight;} + void SetNumberRight(bool bFlag){m_bNumberRight = bFlag;} + bool GetNumberRight(){return m_bNumberRight;} protected: OUString m_strMasterPage; enumXFAlignType m_eAlignType; enumXFAlignType m_eLastLineAlign; - sal_Bool m_bJustSingleWord; - sal_Bool m_bKeepWithNext; + bool m_bJustSingleWord; + bool m_bKeepWithNext; double m_fTextIndent; XFColor m_aBackColor; @@ -260,11 +260,11 @@ protected: XFLineHeight m_aLineHeight; XFBreaks m_aBreaks; sal_Int32 m_nPageNumber; - sal_Bool m_bNumberLines; + bool m_bNumberLines; sal_Int32 m_nLineNumberRestart; sal_uInt32 m_nFlag; - sal_Bool m_bNumberRight; + bool m_bNumberRight; }; inline void XFParaStyle::SetMasterPage(const OUString& master) @@ -283,7 +283,7 @@ inline void XFParaStyle::SetPageNumber(sal_Int32 num) m_nPageNumber = num; } -inline void XFParaStyle::SetLineNumber(sal_Bool show, sal_Int32 restart) +inline void XFParaStyle::SetLineNumber(bool show, sal_Int32 restart) { m_bNumberLines = show; m_nLineNumberRestart = restart; @@ -311,13 +311,13 @@ inline void XFParaStyle::SetAlignType(enumXFAlignType eAlign) m_eAlignType = eAlign; } -inline void XFParaStyle::SetLastLineAlign(enumXFAlignType align, sal_Bool bJustSingleWord) +inline void XFParaStyle::SetLastLineAlign(enumXFAlignType align, bool bJustSingleWord) { m_eLastLineAlign = align; m_bJustSingleWord = bJustSingleWord; } -inline void XFParaStyle::SetKeepWithNext(sal_Bool keep) +inline void XFParaStyle::SetKeepWithNext(bool keep) { m_bKeepWithNext = keep; } diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx index 131224f01b49..2b9c7c9b9774 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx @@ -61,8 +61,8 @@ XFSection::XFSection() { - m_bProtected = sal_False; - m_bHiden = sal_False; + m_bProtected = false; + m_bHiden = false; m_strSectionName = XFGlobal::GenSectionName(); } diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index d75047f248f4..09733c65b7d7 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -85,8 +85,8 @@ public: private: OUString m_strSectionName; - sal_Bool m_bProtected; - sal_Bool m_bHiden; + bool m_bProtected; + bool m_bHiden; XFColor m_aBackColor; OUString m_strSourceLink; }; diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx index daa85c00c5ef..866a433eb349 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx @@ -105,17 +105,17 @@ void XFShadow::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( "style:shadow", ToString() ); } -sal_Bool operator==(XFShadow& s1, XFShadow& s2) +bool operator==(XFShadow& s1, XFShadow& s2) { if( (s1.m_ePosition == s2.m_ePosition) && (s1.m_fOffset == s2.m_fOffset) && (s1.m_aColor == s2.m_aColor) ) - return sal_True; - return sal_False; + return true; + return false; } -sal_Bool operator!=(XFShadow& s1, XFShadow& s2) +bool operator!=(XFShadow& s1, XFShadow& s2) { return !(s1==s2); } diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx index 7300546cf3e2..ac2aa18ea72d 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx @@ -110,8 +110,8 @@ public: virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - friend sal_Bool operator==(XFShadow& s1, XFShadow& s2); - friend sal_Bool operator!=(XFShadow& s1, XFShadow& s2); + friend bool operator==(XFShadow& s1, XFShadow& s2); + friend bool operator!=(XFShadow& s1, XFShadow& s2); private: enumXFShadowPos m_ePosition; double m_fOffset; diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx index 92476f89a17e..a9c46e27674b 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx @@ -98,8 +98,8 @@ void XFStyle::SetStyleFamily(enumXFStyle family) m_enumFamily = family; } -sal_Bool XFStyle::Equal(IXFStyle * /*pStyle*/) +bool XFStyle::Equal(IXFStyle * /*pStyle*/) { - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx index 6c1d28851d12..4ad31970ecc4 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx @@ -107,7 +107,7 @@ public: /** * @descr decide whether two style are equal. */ - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; protected: OUString m_strStyleName; diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index 38a7bd3f5144..9c93b05358d9 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -66,7 +66,7 @@ XFTable::XFTable() { m_strName = XFGlobal::GenTableName(); - m_bSubTable = sal_False; + m_bSubTable = false; m_pOwnerCell = NULL; } diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx index 7210df3730e7..f44c55ed610a 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.hxx +++ b/lotuswordpro/source/filter/xfilter/xftable.hxx @@ -104,7 +104,7 @@ public: sal_Int32 GetColumnCount(); - sal_Bool IsSubTable(); + bool IsSubTable(); void Normalize(); @@ -119,7 +119,7 @@ public: private: OUString m_strName; - sal_Bool m_bSubTable; + bool m_bSubTable; XFCell *m_pOwnerCell; XFContentContainer m_aHeaderRows; std::map<sal_uInt16, XFRow*> m_aRows; @@ -140,7 +140,7 @@ inline void XFTable::SetOwnerCell(XFCell *pCell) m_bSubTable = (pCell!=NULL); } -inline sal_Bool XFTable::IsSubTable() +inline bool XFTable::IsSubTable() { return m_bSubTable; } diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx index e3e592e803f1..aa623b90d248 100644 --- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx @@ -78,30 +78,30 @@ void XFTextStyle::SetFont(XFFont *font) m_pFont = font; } -sal_Bool XFTextStyle::Equal(IXFStyle *pStyle) +bool XFTextStyle::Equal(IXFStyle *pStyle) { if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleText ) { - return sal_False; + return false; } XFTextStyle *pOther = (XFTextStyle*)pStyle; if( !pOther ) { - return sal_False; + return false; } if( m_pFont ) { if( !pOther->m_pFont ) - return sal_False; + return false; if( *m_pFont != *pOther->m_pFont ) - return sal_False; + return false; } else if( pOther->m_pFont ) - return sal_False; + return false; - return sal_True; + return true; } enumXFStyle XFTextStyle::GetStyleFamily() diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx index b7f7312c1655..f047536921f8 100644 --- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx @@ -84,7 +84,7 @@ public: virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; - virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; + virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; virtual void ToXml(IXFStream *strm) SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx index 1568e4c51b90..04d12b62c319 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx @@ -108,9 +108,9 @@ void XFTimePart::ToXml(IXFStream *pStrm) XFTimeStyle::XFTimeStyle() { - m_bFixed = sal_True; - m_bAmPm = sal_False; - m_bTruncate = sal_True; + m_bFixed = true; + m_bAmPm = false; + m_bTruncate = true; } XFTimeStyle::~XFTimeStyle() diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx index 6bbac0c0c78f..09705e0263f8 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx @@ -71,20 +71,20 @@ public: XFDateTimePart() { m_ePart = enumXFDateUnknown; - m_bLongFmt = sal_False; + m_bLongFmt = false; } virtual ~XFDateTimePart(){} public: void SetPartType(enumXFDatePart ePart); - void SetLongFmt(sal_Bool bLongFmt); + void SetLongFmt(bool bLongFmt); void SetText(const OUString& text); protected: enumXFDatePart m_ePart; - sal_Bool m_bLongFmt; + bool m_bLongFmt; OUString m_strText; }; @@ -112,13 +112,13 @@ public: public: - void AddHour( sal_Bool bLongFmt = sal_True ); + void AddHour( bool bLongFmt = true ); - void AddMinute( sal_Bool bLongFmt = sal_True ); + void AddMinute( bool bLongFmt = true ); - void AddSecond( sal_Bool bLongFmt = sal_True, sal_Int16 nDecimalPos = 2); + void AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2); - void SetAmPm(sal_Bool bAmPm); + void SetAmPm(bool bAmPm); void AddText( const OUString& part ); @@ -126,13 +126,13 @@ public: virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - void SetTruncate(sal_Bool bTrunc); + void SetTruncate(bool bTrunc); private: - sal_Bool m_bFixed; - sal_Bool m_bAmPm; + bool m_bFixed; + bool m_bAmPm; std::vector<XFTimePart> m_aParts; - sal_Bool m_bTruncate; + bool m_bTruncate; }; inline void XFDateTimePart::SetPartType(enumXFDatePart ePart) @@ -140,7 +140,7 @@ inline void XFDateTimePart::SetPartType(enumXFDatePart ePart) m_ePart = ePart; } -inline void XFDateTimePart::SetLongFmt(sal_Bool bLongFmt) +inline void XFDateTimePart::SetLongFmt(bool bLongFmt) { m_bLongFmt = bLongFmt; } @@ -155,7 +155,7 @@ inline void XFTimePart::SetDecimalPos(sal_Int32 pos) m_nDecimalPos = pos; } -inline void XFTimeStyle::AddHour( sal_Bool bLongFmt ) +inline void XFTimeStyle::AddHour( bool bLongFmt ) { XFTimePart part; part.SetPartType(enumXFDateHour); @@ -163,7 +163,7 @@ inline void XFTimeStyle::AddHour( sal_Bool bLongFmt ) m_aParts.push_back(part); } -inline void XFTimeStyle::AddMinute( sal_Bool bLongFmt ) +inline void XFTimeStyle::AddMinute( bool bLongFmt ) { XFTimePart part; part.SetPartType(enumXFDateMinute); @@ -171,7 +171,7 @@ inline void XFTimeStyle::AddMinute( sal_Bool bLongFmt ) m_aParts.push_back(part); } -inline void XFTimeStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos) +inline void XFTimeStyle::AddSecond( bool bLongFmt, sal_Int16 pos) { XFTimePart part; part.SetPartType(enumXFDateSecond); @@ -180,7 +180,7 @@ inline void XFTimeStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos) m_aParts.push_back(part); } -inline void XFTimeStyle::SetAmPm(sal_Bool bAmPm) +inline void XFTimeStyle::SetAmPm(bool bAmPm) { m_bAmPm = bAmPm; } @@ -193,7 +193,7 @@ inline void XFTimeStyle::AddText( const OUString& text ) m_aParts.push_back(part); } -inline void XFTimeStyle::SetTruncate(sal_Bool bTrunc) +inline void XFTimeStyle::SetTruncate(bool bTrunc) { m_bTruncate = bTrunc; } |