diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-10 02:48:41 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-10 02:50:04 +0900 |
commit | 6509bbee4f752b2b47df2511d5004c1a23317da5 (patch) | |
tree | c1d26763aa3ca4fe9af12901e7870a342705cfe8 /xmloff | |
parent | Mark as const / static (diff) | |
download | core-6509bbee4f752b2b47df2511d5004c1a23317da5.tar.gz core-6509bbee4f752b2b47df2511d5004c1a23317da5.zip |
sal_Bool to bool
Change-Id: If6d39259c29e9abcb693c9b0bdfb89b94001f928
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/text/XMLFootnoteImportContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextListItemContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 16 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 62 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.hxx | 4 |
7 files changed, 51 insertions, 51 deletions
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index fde5711b9ae3..b202a18ea00b 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -59,7 +59,7 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext { OUStringBuffer sBuffer; XMLFootnoteConfigurationImportContext& rConfig; - sal_Bool bIsBegin; + bool bIsBegin; public: TYPEINFO(); @@ -69,7 +69,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, XMLFootnoteConfigurationImportContext& rConfigImport, - sal_Bool bBegin); + bool bBegin); virtual void EndElement(); @@ -83,7 +83,7 @@ XMLFootnoteConfigHelper::XMLFootnoteConfigHelper( sal_uInt16 nPrfx, const OUString& rLName, XMLFootnoteConfigurationImportContext& rConfigImport, - sal_Bool bBegin) + bool bBegin) : SvXMLImportContext(rImport, nPrfx, rLName) , sBuffer() , rConfig(rConfigImport) @@ -305,14 +305,14 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( { pContext = new XMLFootnoteConfigHelper(GetImport(), nPrefix, rLocalName, - *this, sal_False); + *this, false); } else if ( IsXMLToken( rLocalName, XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) ) { pContext = new XMLFootnoteConfigHelper(GetImport(), nPrefix, rLocalName, - *this, sal_True); + *this, true); } // else: default context } diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index f1e29cf92730..5ea7c5480380 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -85,7 +85,7 @@ void XMLFootnoteImportContext::StartElement( if( xFactory.is() ) { // create endnote or footnote - sal_Bool bIsEndnote = sal_False; + bool bIsEndnote = false; sal_Int16 nLength = xAttrList->getLength(); for(sal_Int16 nAttr1 = 0; nAttr1 < nLength; nAttr1++) { @@ -98,7 +98,7 @@ void XMLFootnoteImportContext::StartElement( { const OUString& rValue = xAttrList->getValueByIndex( nAttr1 ); if( IsXMLToken( rValue, XML_ENDNOTE ) ) - bIsEndnote = sal_True; + bIsEndnote = true; break; } } diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 46378f4ef374..0893b71d07b5 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -139,11 +139,11 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext( SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = rTxtImport.GetTextElemTokenMap(); - sal_Bool bHeading = sal_False; + bool bHeading = false; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { case XML_TOK_TEXT_H: - bHeading = sal_True; + bHeading = true; case XML_TOK_TEXT_P: pContext = new XMLParaContext( GetImport(), nPrefix, rLocalName, diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 218345275b36..335235c76ed3 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3066,10 +3066,10 @@ void XMLDdeFieldDeclImportContext::StartElement( OUString sCommandItem; sal_Bool bUpdate = sal_False; - sal_Bool bNameOK = sal_False; - sal_Bool bCommandApplicationOK = sal_False; - sal_Bool bCommandTopicOK = sal_False; - sal_Bool bCommandItemOK = sal_False; + bool bNameOK = false; + bool bCommandApplicationOK = false; + bool bCommandTopicOK = false; + bool bCommandItemOK = false; // process attributes sal_Int16 nLength = xAttrList->getLength(); @@ -3084,19 +3084,19 @@ void XMLDdeFieldDeclImportContext::StartElement( { case XML_TOK_DDEFIELD_NAME: sName = xAttrList->getValueByIndex(i); - bNameOK = sal_True; + bNameOK = true; break; case XML_TOK_DDEFIELD_APPLICATION: sCommandApplication = xAttrList->getValueByIndex(i); - bCommandApplicationOK = sal_True; + bCommandApplicationOK = true; break; case XML_TOK_DDEFIELD_TOPIC: sCommandTopic = xAttrList->getValueByIndex(i); - bCommandTopicOK = sal_True; + bCommandTopicOK = true; break; case XML_TOK_DDEFIELD_ITEM: sCommandItem = xAttrList->getValueByIndex(i); - bCommandItemOK = sal_True; + bCommandItemOK = true; break; case XML_TOK_DDEFIELD_UPDATE: { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 33c9c2d638db..644f788d2f63 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1173,7 +1173,7 @@ void XMLTextImportHelper::DeleteParagraph() DBG_ASSERT(m_pImpl->m_xCursor.is(), "no cursor"); DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range"); - sal_Bool bDelete = sal_True; + bool bDelete = true; Reference < XEnumerationAccess > const xEnumAccess( m_pImpl->m_xCursor, UNO_QUERY); if( xEnumAccess.is() ) @@ -1187,7 +1187,7 @@ void XMLTextImportHelper::DeleteParagraph() if( xComp.is() ) { xComp->dispose(); - bDelete = sal_False; + bDelete = false; } } } @@ -1209,7 +1209,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, SvXMLImport& rImport ) const { OUStringBuffer sChars( rChars ); - sal_Bool bConverted = sal_False; + bool bConverted = false; for( sal_Int32 j=0; j<rChars.getLength(); j++ ) { sal_Unicode c = rChars[j]; @@ -1270,12 +1270,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, if( (rFlags & CONV_FROM_STAR_BATS ) != 0 ) { sChars[j] = rImport.ConvStarBatsCharToStarSymbol( c ); - bConverted = sal_True; + bConverted = true; } else if( (rFlags & CONV_FROM_STAR_MATH ) != 0 ) { sChars[j] = rImport.ConvStarMathCharToStarSymbol( c ); - bConverted = sal_True; + bConverted = true; } } } @@ -1289,18 +1289,18 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, /* Apply special case, that found list style equals the chapter numbering, also to the found list styles of the parent styles. (#i73973#) */ -static sal_Bool lcl_HasListStyle( OUString sStyleName, +static bool lcl_HasListStyle( OUString sStyleName, const Reference < XNameContainer >& xParaStyles, SvXMLImport& rImport, const OUString& sNumberingStyleName, const OUString& sOutlineStyleName ) { - sal_Bool bRet( sal_False ); + bool bRet( false ); if ( !xParaStyles->hasByName( sStyleName ) ) { // error case - return sal_True; + return true; } Reference< XPropertyState > xPropState( xParaStyles->getByName( sStyleName ), @@ -1308,13 +1308,13 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName, if ( !xPropState.is() ) { // error case - return sal_False; + return false; } if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE ) { // list style found - bRet = sal_True; + bRet = true; // special case: the set list style equals the chapter numbering Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); if ( xPropSet.is() ) @@ -1324,7 +1324,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName, if ( !sListStyle.isEmpty() && sListStyle == sOutlineStyleName ) { - bRet = sal_False; + bRet = false; } } } @@ -1359,12 +1359,12 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName, if ( !xPropState.is() ) { // error case - return sal_True; + return true; } if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE ) { // list style found - bRet = sal_True; + bRet = true; // Special case: the found list style equals the chapter numbering (#i73973#) Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); if ( xPropSet.is() ) @@ -1374,7 +1374,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName, if ( !sListStyle.isEmpty() && sListStyle == sOutlineStyleName ) { - bRet = sal_False; + bRet = false; } // Special handling for text documents from OOo version prior OOo 2.4 (#i77708#) /* Check explicitly on certain versions and on import of @@ -1386,7 +1386,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName, ( ( nUPD == 641 ) || ( nUPD == 645 ) || // prior OOo 2.0 ( nUPD == 680 && nBuild <= 9238 ) ) ) ) ) // OOo 2.0 - OOo 2.3.1 { - bRet = sal_False; + bRet = false; } } break; @@ -1521,10 +1521,10 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if (pListBlock || pNumberedParagraph) { // Assure that list style of automatic paragraph style is applied at paragraph. (#i101349#) - sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet(); + bool bApplyNumRules = pStyle && pStyle->IsListStyleSet(); if ( !bApplyNumRules ) { - sal_Bool bSameNumRules = xNewNumRules == xNumRules; + bool bSameNumRules = xNewNumRules == xNumRules; if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() ) { // If the interface pointers are different then this does @@ -2156,13 +2156,13 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = GetTextElemTokenMap(); - sal_Bool bHeading = sal_False; - sal_Bool bContent = sal_True; + bool bHeading = false; + bool bContent = true; sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); switch( nToken ) { case XML_TOK_TEXT_H: - bHeading = sal_True; + bHeading = true; case XML_TOK_TEXT_P: pContext = new XMLParaContext( rImport, nPrefix, rLocalName, @@ -2197,7 +2197,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { pContext = new XMLVariableDeclsImportContext( rImport, *this, nPrefix, rLocalName, VarTypeSequence); - bContent = sal_False; + bContent = false; } break; @@ -2207,7 +2207,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { pContext = new XMLVariableDeclsImportContext( rImport, *this, nPrefix, rLocalName, VarTypeSimple); - bContent = sal_False; + bContent = false; } break; @@ -2217,7 +2217,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { pContext = new XMLVariableDeclsImportContext( rImport, *this, nPrefix, rLocalName, VarTypeUserField); - bContent = sal_False; + bContent = false; } break; @@ -2227,7 +2227,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { pContext = new XMLDdeFieldDeclsImportContext( rImport, nPrefix, rLocalName); - bContent = sal_False; + bContent = false; } break; @@ -2242,7 +2242,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( pContext = new XMLTextFrameContext( rImport, nPrefix, rLocalName, xAttrList, eAnchorType ); - bContent = sal_False; + bContent = false; } break; @@ -2257,7 +2257,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( pContext = new XMLTextFrameHyperlinkContext( rImport, nPrefix, rLocalName, xAttrList, eAnchorType ); - bContent = sal_False; + bContent = false; } break; @@ -2280,7 +2280,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( case XML_TOK_TEXT_TRACKED_CHANGES: pContext = new XMLTrackedChangesImportContext( rImport, nPrefix, rLocalName); - bContent = sal_False; + bContent = false; break; case XML_TOK_TEXT_CHANGE: @@ -2295,7 +2295,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( case XML_TOK_TEXT_FORMS: pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName); - bContent = sal_False; + bContent = false; break; case XML_TOK_TEXT_AUTOMARK: @@ -2303,12 +2303,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { pContext = new XMLAutoMarkFileContext(rImport, nPrefix,rLocalName); } - bContent = sal_False; + bContent = false; break; case XML_TOK_TEXT_CALCULATION_SETTINGS: pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList); - bContent = sal_False; + bContent = false; break; default: @@ -2319,7 +2319,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( Reference < XShapes > xShapes; pContext = rImport.GetShapeImport()->CreateGroupChildContext( rImport, nPrefix, rLocalName, xAttrList, xShapes ); - bContent = sal_False; + bContent = false; } } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index c6dd03170b29..c73c129366ae 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1828,7 +1828,7 @@ XMLParaContext::XMLParaContext( sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - sal_Bool bHead ) : + bool bHead ) : SvXMLImportContext( rImport, nPrfx, rLName ), xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ), m_bHaveAbout(false), diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index e4557ad8c847..2c4376081baf 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -49,7 +49,7 @@ class XMLParaContext : public SvXMLImportContext // Lost outline numbering in master document (#i73509#) sal_Bool mbOutlineLevelAttrFound; sal_Bool bIgnoreLeadingSpace; - sal_Bool bHeading; + bool bHeading; sal_Bool bIsListHeader; sal_Bool bIsRestart; sal_Int16 nStartValue; @@ -64,7 +64,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - sal_Bool bHeading ); + bool bHeading ); virtual ~XMLParaContext(); |