diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-12 17:57:44 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-12 17:58:12 +0900 |
commit | 3bba060388fde3272c93f96050a56f62d364256c (patch) | |
tree | 73844c6f2bdd113f3994c4e0f58701096434259b /xmloff | |
parent | 9ab5bb0cc20cbc56657b77419fb47fdfb8752e7b (diff) |
sal_Bool to bool
Change-Id: I826911bdf06b8047ca8e3bd256687e10fb51962d
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 20 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 28 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.hxx | 2 |
3 files changed, 25 insertions, 25 deletions
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 45f9323575ed..20dcd990e375 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1134,8 +1134,8 @@ void XMLDocumentTransformerContext_Impl::StartElement( m_aOldClass = GetTransformer().GetClass(); XMLMutableAttributeList *pMutableAttrList = 0; - sal_Bool bOOo = sal_False, bOOoW = sal_False, bOOoC = sal_False, - bDOM=sal_False, bDC = sal_False, bSVG = sal_False; + bool bOOo = false, bOOoW = false, bOOoC = false, + bDOM=false, bDC = false, bSVG = false; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -1163,17 +1163,17 @@ void XMLDocumentTransformerContext_Impl::StartElement( { const OUString& rAttrValue = xAttrList->getValueByIndex( i ); if( IsXMLToken( rAttrValue, XML_N_OOO ) ) - bOOo = sal_True; + bOOo = true; else if( IsXMLToken( rAttrValue, XML_N_OOOW ) ) - bOOoW = sal_True; + bOOoW = true; else if( IsXMLToken( rAttrValue, XML_N_OOOC ) ) - bOOoC = sal_True; + bOOoC = true; else if( IsXMLToken( rAttrValue, XML_N_DOM ) ) - bDOM = sal_True; + bDOM = true; else if( IsXMLToken( rAttrValue, XML_N_DC ) ) - bDC = sal_True; + bDC = true; else if( IsXMLToken( rAttrValue, XML_N_SVG ) ) - bSVG = sal_True; + bSVG = true; } } if( !(bOOo && bOOoW && bOOoC && bDOM && bDC && bSVG) ) @@ -1509,7 +1509,7 @@ void XMLTableOOoTransformerContext_Impl::StartElement( GetTransformer().ProcessAttrList( xAttrList, OOO_STYLE_REF_ACTIONS, sal_False ); if( rAttrList->getLength() && IsXMLToken( GetTransformer().GetClass(), XML_SPREADSHEET ) ) { - sal_Bool bPrintRanges(sal_False); + bool bPrintRanges(false); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -1522,7 +1522,7 @@ void XMLTableOOoTransformerContext_Impl::StartElement( if( XML_NAMESPACE_TABLE == nPrefix && IsXMLToken( aLocalName, XML_PRINT_RANGES ) ) { - bPrintRanges = sal_True; + bPrintRanges = true; } } if (!bPrintRanges && pMutableAttrList) diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 9099d0bed750..f5ef3fe0f2b7 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -65,7 +65,7 @@ class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; XMLPropType m_ePropType; - sal_Bool m_bControlStyle; + bool m_bControlStyle; OUString m_aStyleFamily; public: @@ -83,7 +83,7 @@ public: const OUString& rQName, XMLPropType eP, const OUString& rStyleFamily, - sal_Bool _bControlStyle = sal_False ); + bool _bControlStyle = false ); virtual ~XMLPropertiesTContext_Impl(); @@ -94,9 +94,9 @@ public: static XMLPropType GetPropType( const OUString& rLocalName ); static OUString MergeUnderline( XMLTokenEnum eUnderline, - sal_Bool bBold, sal_Bool bDouble ); + bool bBold, bool bDouble ); static OUString MergeLineThrough( XMLTokenEnum eLineThrough, - sal_Bool bBold, sal_Bool bDouble, + bool bBold, bool bDouble, sal_Unicode c ); }; @@ -104,7 +104,7 @@ TYPEINIT1( XMLPropertiesTContext_Impl, XMLPersElemContentTContext ); XMLPropertiesTContext_Impl::XMLPropertiesTContext_Impl( XMLTransformerBase& rImp, const OUString& rQName, XMLPropType eP, - const OUString& rStyleFamily, sal_Bool _bControlStyle ) : + const OUString& rStyleFamily, bool _bControlStyle ) : XMLPersElemContentTContext( rImp, rQName, XML_NAMESPACE_STYLE, XML_PROPERTIES), m_ePropType( eP ), @@ -143,9 +143,9 @@ void XMLPropertiesTContext_Impl::StartElement( } XMLTokenEnum eUnderline = XML_TOKEN_END; - sal_Bool bBoldUnderline = sal_False, bDoubleUnderline = sal_False; + bool bBoldUnderline = false, bDoubleUnderline = false; XMLTokenEnum eLineThrough = XML_TOKEN_END; - sal_Bool bBoldLineThrough = sal_False, bDoubleLineThrough = sal_False; + bool bBoldLineThrough = false, bDoubleLineThrough = false; sal_Unicode cLineThroughChar = 0; bool bIntervalMinorFound = false; @@ -285,22 +285,22 @@ void XMLPropertiesTContext_Impl::StartElement( break; case XML_OPTACTION_UNDERLINE_WIDTH: if( IsXMLToken( rAttrValue, XML_BOLD ) ) - bBoldUnderline = sal_True; + bBoldUnderline = true; break; case XML_OPTACTION_UNDERLINE_TYPE: if( IsXMLToken( rAttrValue, XML_DOUBLE ) ) - bDoubleUnderline = sal_True; + bDoubleUnderline = true; break; case XML_OPTACTION_UNDERLINE_STYLE: eUnderline = GetTransformer().GetToken( rAttrValue ); break; case XML_OPTACTION_LINETHROUGH_WIDTH: if( IsXMLToken( rAttrValue, XML_BOLD ) ) - bBoldLineThrough = sal_True; + bBoldLineThrough = true; break; case XML_OPTACTION_LINETHROUGH_TYPE: if( IsXMLToken( rAttrValue, XML_DOUBLE ) ) - bDoubleLineThrough = sal_True; + bDoubleLineThrough = true; break; case XML_OPTACTION_LINETHROUGH_STYLE: eLineThrough = GetTransformer().GetToken( rAttrValue ); @@ -661,7 +661,7 @@ XMLPropType XMLPropertiesTContext_Impl::GetPropType( const OUString& rLocalName } OUString XMLPropertiesTContext_Impl::MergeUnderline( - XMLTokenEnum eUnderline, sal_Bool bBold, sal_Bool bDouble ) + XMLTokenEnum eUnderline, bool bBold, bool bDouble ) { if( bDouble ) { @@ -726,7 +726,7 @@ OUString XMLPropertiesTContext_Impl::MergeUnderline( } OUString XMLPropertiesTContext_Impl::MergeLineThrough( - XMLTokenEnum eLineThrough, sal_Bool bBold, sal_Bool bDouble, + XMLTokenEnum eLineThrough, bool bBold, bool bDouble, sal_Unicode c ) { if( c ) @@ -820,7 +820,7 @@ void XMLStyleOASISTContext::StartElement( XMLMutableAttributeList *pMutableAttrList = 0; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; sal_Int16 nFamilyAttr = -1; - m_bControlStyle = sal_False; + m_bControlStyle = false; for( sal_Int16 i=0; i < nAttrCount; i++ ) { diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index a037c58655ac..fd5464f89bc6 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -31,7 +31,7 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext ::rtl::Reference< XMLPropertiesTContext_Impl > m_xPropContext; sal_Bool m_bPersistent; - sal_Bool m_bControlStyle; + bool m_bControlStyle; OUString m_aStyleFamily; public: |