diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-25 06:29:23 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-25 09:05:39 +0900 |
commit | c5c4ab6c545acc9caeaa8bc1cef122a0862d1168 (patch) | |
tree | 449a73dff9bf586fb038c74fc2c1765141f5d22f /xmloff | |
parent | Mark as const / static (diff) | |
download | core-c5c4ab6c545acc9caeaa8bc1cef122a0862d1168.tar.gz core-c5c4ab6c545acc9caeaa8bc1cef122a0862d1168.zip |
sal_Bool to bool
Change-Id: I390b6b0d8e1c143a0d2e8f4f0a1ec80c2924942c
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/DashStyle.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterImportContext.cxx | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index ecf8efab18a4..f15b7870dfbe 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -99,7 +99,7 @@ sal_Bool XMLDashStyleImport::importXML( aLineDash.Distance = 20; OUString aDisplayName; - sal_Bool bIsRel = sal_False; + bool bIsRel = false; SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap(); SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter(); @@ -143,7 +143,7 @@ sal_Bool XMLDashStyleImport::importXML( { if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage { - bIsRel = sal_True; + bIsRel = true; ::sax::Converter::convertPercent(aLineDash.DotLen, rStrValue); } else @@ -162,7 +162,7 @@ sal_Bool XMLDashStyleImport::importXML( { if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage { - bIsRel = sal_True; + bIsRel = true; ::sax::Converter::convertPercent(aLineDash.DashLen, rStrValue); } else @@ -177,7 +177,7 @@ sal_Bool XMLDashStyleImport::importXML( { if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage { - bIsRel = sal_True; + bIsRel = true; ::sax::Converter::convertPercent(aLineDash.Distance, rStrValue); } else @@ -232,7 +232,7 @@ sal_Bool XMLDashStyleExport::exportXML( { if( rValue >>= aLineDash ) { - sal_Bool bIsRel = aLineDash.Style == drawing::DashStyle_RECTRELATIVE || aLineDash.Style == drawing::DashStyle_ROUNDRELATIVE; + bool bIsRel = aLineDash.Style == drawing::DashStyle_RECTRELATIVE || aLineDash.Style == drawing::DashStyle_ROUNDRELATIVE; OUString aStrValue; OUStringBuffer aOut; diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index b9da68a4783a..04faafe26d62 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans; using namespace ::comphelper; using namespace ::xmloff::token; -static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) +static inline bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) { return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) && (rLine1.OuterLineWidth == rLine2.OuterLineWidth) && @@ -40,7 +40,7 @@ static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, c (rLine1.LineWidth == rLine2.LineWidth); } -inline sal_Bool operator==( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) +inline bool operator==( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) { return (rLine1.Color == rLine2.Color) && lcl_HasSameLineWidth( rLine1, rLine2 ) && diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index e817285f75ce..6f354b1b9993 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -88,8 +88,8 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( nFlag = CTF_PM_FOOTERFLAG; sal_Int32 nStartIndex (-1); sal_Int32 nEndIndex (-1); - sal_Bool bFirst(sal_False); - sal_Bool bEnd(sal_False); + bool bFirst(false); + bool bEnd(false); sal_Int32 nIndex = 0; while ( nIndex < rMapper->GetEntryCount() && !bEnd) { @@ -97,13 +97,13 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( { if (!bFirst) { - bFirst = sal_True; + bFirst = true; nStartIndex = nIndex; } } else if (bFirst) { - bEnd = sal_True; + bEnd = true; nEndIndex = nIndex; } nIndex++; @@ -123,7 +123,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( { const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); sal_Int32 nEndIndex (-1); - sal_Bool bEnd(sal_False); + bool bEnd(false); sal_Int32 nIndex = 0; sal_Int16 nContextID; while ( nIndex < rMapper->GetEntryCount() && !bEnd) @@ -132,7 +132,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( if (nContextID && ((nContextID & CTF_PM_FLAGMASK) != XML_PM_CTF_START)) { nEndIndex = nIndex; - bEnd = sal_True; + bEnd = true; } nIndex++; } |