mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool to bool

Browse Source 
Change-Id: If6d39259c29e9abcb693c9b0bdfb89b94001f928
This commit is contained in:
Takeshi Abe
2013-09-10 02:48:41 +09:00
parent 396534403b
commit 6509bbee4f
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
View File

@@ -59,7 +59,7 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext
{ {
OUStringBuffer sBuffer; OUStringBuffer sBuffer;
XMLFootnoteConfigurationImportContext& rConfig; XMLFootnoteConfigurationImportContext& rConfig;
sal_Bool bIsBegin; bool bIsBegin;
public: public:
TYPEINFO(); TYPEINFO();
@@ -69,7 +69,7 @@ public:
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport, XMLFootnoteConfigurationImportContext& rConfigImport,
sal_Bool bBegin); bool bBegin);
virtual void EndElement(); virtual void EndElement();
@@ -83,7 +83,7 @@ XMLFootnoteConfigHelper::XMLFootnoteConfigHelper(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
XMLFootnoteConfigurationImportContext& rConfigImport, XMLFootnoteConfigurationImportContext& rConfigImport,
sal_Bool bBegin) bool bBegin)
: SvXMLImportContext(rImport, nPrfx, rLName) : SvXMLImportContext(rImport, nPrfx, rLName)
, sBuffer() , sBuffer()
, rConfig(rConfigImport) , rConfig(rConfigImport)
@@ -305,14 +305,14 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
{ {
pContext = new XMLFootnoteConfigHelper(GetImport(), pContext = new XMLFootnoteConfigHelper(GetImport(),
nPrefix, rLocalName, nPrefix, rLocalName,
*this, sal_False); *this, false);
} }
else if ( IsXMLToken( rLocalName, else if ( IsXMLToken( rLocalName,
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) ) XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) )
{ {
pContext = new XMLFootnoteConfigHelper(GetImport(), pContext = new XMLFootnoteConfigHelper(GetImport(),
nPrefix, rLocalName, nPrefix, rLocalName,
*this, sal_True); *this, true);
} }
// else: default context // else: default context
} }

4
xmloff/source/text/XMLFootnoteImportContext.cxx
View File

@@ -85,7 +85,7 @@ void XMLFootnoteImportContext::StartElement(
if( xFactory.is() ) if( xFactory.is() )
{ {
// create endnote or footnote // create endnote or footnote
sal_Bool bIsEndnote = sal_False; bool bIsEndnote = false;
sal_Int16 nLength = xAttrList->getLength(); sal_Int16 nLength = xAttrList->getLength();
for(sal_Int16 nAttr1 = 0; nAttr1 < nLength; nAttr1++) for(sal_Int16 nAttr1 = 0; nAttr1 < nLength; nAttr1++)
{ {
@@ -98,7 +98,7 @@ void XMLFootnoteImportContext::StartElement(
{ {
const OUString& rValue = xAttrList->getValueByIndex( nAttr1 ); const OUString& rValue = xAttrList->getValueByIndex( nAttr1 );
if( IsXMLToken( rValue, XML_ENDNOTE ) ) if( IsXMLToken( rValue, XML_ENDNOTE ) )
bIsEndnote = sal_True; bIsEndnote = true;
break; break;
} }
} }

4
xmloff/source/text/XMLTextListItemContext.cxx
View File

@@ -139,11 +139,11 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
SvXMLImportContext *pContext = 0; SvXMLImportContext *pContext = 0;
const SvXMLTokenMap& rTokenMap = rTxtImport.GetTextElemTokenMap(); const SvXMLTokenMap& rTokenMap = rTxtImport.GetTextElemTokenMap();
sal_Bool bHeading = sal_False; bool bHeading = false;
switch( rTokenMap.Get( nPrefix, rLocalName ) ) switch( rTokenMap.Get( nPrefix, rLocalName ) )
{ {
case XML_TOK_TEXT_H: case XML_TOK_TEXT_H:
bHeading = sal_True; bHeading = true;
case XML_TOK_TEXT_P: case XML_TOK_TEXT_P:
pContext = new XMLParaContext( GetImport(), pContext = new XMLParaContext( GetImport(),
nPrefix, rLocalName, nPrefix, rLocalName,

16
xmloff/source/text/txtfldi.cxx
View File

@@ -3066,10 +3066,10 @@ void XMLDdeFieldDeclImportContext::StartElement(
OUString sCommandItem; OUString sCommandItem;
sal_Bool bUpdate = sal_False; sal_Bool bUpdate = sal_False;
sal_Bool bNameOK = sal_False; bool bNameOK = false;
sal_Bool bCommandApplicationOK = sal_False; bool bCommandApplicationOK = false;
sal_Bool bCommandTopicOK = sal_False; bool bCommandTopicOK = false;
sal_Bool bCommandItemOK = sal_False; bool bCommandItemOK = false;
// process attributes // process attributes
sal_Int16 nLength = xAttrList->getLength(); sal_Int16 nLength = xAttrList->getLength();
@@ -3084,19 +3084,19 @@ void XMLDdeFieldDeclImportContext::StartElement(
{ {
case XML_TOK_DDEFIELD_NAME: case XML_TOK_DDEFIELD_NAME:
sName = xAttrList->getValueByIndex(i); sName = xAttrList->getValueByIndex(i);
bNameOK = sal_True; bNameOK = true;
break; break;
case XML_TOK_DDEFIELD_APPLICATION: case XML_TOK_DDEFIELD_APPLICATION:
sCommandApplication = xAttrList->getValueByIndex(i); sCommandApplication = xAttrList->getValueByIndex(i);
bCommandApplicationOK = sal_True; bCommandApplicationOK = true;
break; break;
case XML_TOK_DDEFIELD_TOPIC: case XML_TOK_DDEFIELD_TOPIC:
sCommandTopic = xAttrList->getValueByIndex(i); sCommandTopic = xAttrList->getValueByIndex(i);
bCommandTopicOK = sal_True; bCommandTopicOK = true;
break; break;
case XML_TOK_DDEFIELD_ITEM: case XML_TOK_DDEFIELD_ITEM:
sCommandItem = xAttrList->getValueByIndex(i); sCommandItem = xAttrList->getValueByIndex(i);
bCommandItemOK = sal_True; bCommandItemOK = true;
break; break;
case XML_TOK_DDEFIELD_UPDATE: case XML_TOK_DDEFIELD_UPDATE:
{ {

62
xmloff/source/text/txtimp.cxx
View File

@@ -1173,7 +1173,7 @@ void XMLTextImportHelper::DeleteParagraph()
DBG_ASSERT(m_pImpl->m_xCursor.is(), "no cursor"); DBG_ASSERT(m_pImpl->m_xCursor.is(), "no cursor");
DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range"); DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range");
sal_Bool bDelete = sal_True; bool bDelete = true;
Reference < XEnumerationAccess > const xEnumAccess( Reference < XEnumerationAccess > const xEnumAccess(
m_pImpl->m_xCursor, UNO_QUERY); m_pImpl->m_xCursor, UNO_QUERY);
if( xEnumAccess.is() ) if( xEnumAccess.is() )
@@ -1187,7 +1187,7 @@ void XMLTextImportHelper::DeleteParagraph()
if( xComp.is() ) if( xComp.is() )
{ {
xComp->dispose(); xComp->dispose();
bDelete = sal_False; bDelete = false;
} }
} }
} }
@@ -1209,7 +1209,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
SvXMLImport& rImport ) const SvXMLImport& rImport ) const
{ {
OUStringBuffer sChars( rChars ); OUStringBuffer sChars( rChars );
sal_Bool bConverted = sal_False; bool bConverted = false;
for( sal_Int32 j=0; j<rChars.getLength(); j++ ) for( sal_Int32 j=0; j<rChars.getLength(); j++ )
{ {
sal_Unicode c = rChars[j]; sal_Unicode c = rChars[j];
@@ -1270,12 +1270,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
if( (rFlags & CONV_FROM_STAR_BATS ) != 0 ) if( (rFlags & CONV_FROM_STAR_BATS ) != 0 )
{ {
sChars[j] = rImport.ConvStarBatsCharToStarSymbol( c ); sChars[j] = rImport.ConvStarBatsCharToStarSymbol( c );
bConverted = sal_True; bConverted = true;
} }
else if( (rFlags & CONV_FROM_STAR_MATH ) != 0 ) else if( (rFlags & CONV_FROM_STAR_MATH ) != 0 )
{ {
sChars[j] = rImport.ConvStarMathCharToStarSymbol( c ); 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 /* Apply special case, that found list style equals the chapter numbering, also
to the found list styles of the parent styles. (#i73973#) 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, const Reference < XNameContainer >& xParaStyles,
SvXMLImport& rImport, SvXMLImport& rImport,
const OUString& sNumberingStyleName, const OUString& sNumberingStyleName,
const OUString& sOutlineStyleName ) const OUString& sOutlineStyleName )
{ {
sal_Bool bRet( sal_False ); bool bRet( false );
if ( !xParaStyles->hasByName( sStyleName ) ) if ( !xParaStyles->hasByName( sStyleName ) )
{ {
// error case // error case
return sal_True; return true;
} }
Reference< XPropertyState > xPropState( xParaStyles->getByName( sStyleName ), Reference< XPropertyState > xPropState( xParaStyles->getByName( sStyleName ),
@@ -1308,13 +1308,13 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !xPropState.is() ) if ( !xPropState.is() )
{ {
// error case // error case
return sal_False; return false;
} }
if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE ) if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE )
{ {
// list style found // list style found
bRet = sal_True; bRet = true;
// special case: the set list style equals the chapter numbering // special case: the set list style equals the chapter numbering
Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY );
if ( xPropSet.is() ) if ( xPropSet.is() )
@@ -1324,7 +1324,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !sListStyle.isEmpty() && if ( !sListStyle.isEmpty() &&
sListStyle == sOutlineStyleName ) sListStyle == sOutlineStyleName )
{ {
bRet = sal_False; bRet = false;
} }
} }
} }
@@ -1359,12 +1359,12 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !xPropState.is() ) if ( !xPropState.is() )
{ {
// error case // error case
return sal_True; return true;
} }
if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE ) if ( xPropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE )
{ {
// list style found // list style found
bRet = sal_True; bRet = true;
// Special case: the found list style equals the chapter numbering (#i73973#) // Special case: the found list style equals the chapter numbering (#i73973#)
Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY );
if ( xPropSet.is() ) if ( xPropSet.is() )
@@ -1374,7 +1374,7 @@ static sal_Bool lcl_HasListStyle( OUString sStyleName,
if ( !sListStyle.isEmpty() && if ( !sListStyle.isEmpty() &&
sListStyle == sOutlineStyleName ) sListStyle == sOutlineStyleName )
{ {
bRet = sal_False; bRet = false;
} }
// Special handling for text documents from OOo version prior OOo 2.4 (#i77708#) // Special handling for text documents from OOo version prior OOo 2.4 (#i77708#)
/* Check explicitly on certain versions and on import of /* 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 == 641 ) || ( nUPD == 645 ) || // prior OOo 2.0
( nUPD == 680 && nBuild <= 9238 ) ) ) ) ) // OOo 2.0 - OOo 2.3.1 ( nUPD == 680 && nBuild <= 9238 ) ) ) ) ) // OOo 2.0 - OOo 2.3.1
{ {
bRet = sal_False; bRet = false;
} }
} }
break; break;
@@ -1521,10 +1521,10 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
if (pListBlock || pNumberedParagraph) if (pListBlock || pNumberedParagraph)
{ {
// Assure that list style of automatic paragraph style is applied at paragraph. (#i101349#) // 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 ) if ( !bApplyNumRules )
{ {
sal_Bool bSameNumRules = xNewNumRules == xNumRules; bool bSameNumRules = xNewNumRules == xNumRules;
if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() ) if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
{ {
// If the interface pointers are different then this does // If the interface pointers are different then this does
@@ -2156,13 +2156,13 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
SvXMLImportContext *pContext = 0; SvXMLImportContext *pContext = 0;
const SvXMLTokenMap& rTokenMap = GetTextElemTokenMap(); const SvXMLTokenMap& rTokenMap = GetTextElemTokenMap();
sal_Bool bHeading = sal_False; bool bHeading = false;
sal_Bool bContent = sal_True; bool bContent = true;
sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
switch( nToken ) switch( nToken )
{ {
case XML_TOK_TEXT_H: case XML_TOK_TEXT_H:
bHeading = sal_True; bHeading = true;
case XML_TOK_TEXT_P: case XML_TOK_TEXT_P:
pContext = new XMLParaContext( rImport, pContext = new XMLParaContext( rImport,
nPrefix, rLocalName, nPrefix, rLocalName,
@@ -2197,7 +2197,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{ {
pContext = new XMLVariableDeclsImportContext( pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeSequence); rImport, *this, nPrefix, rLocalName, VarTypeSequence);
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2207,7 +2207,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{ {
pContext = new XMLVariableDeclsImportContext( pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeSimple); rImport, *this, nPrefix, rLocalName, VarTypeSimple);
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2217,7 +2217,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{ {
pContext = new XMLVariableDeclsImportContext( pContext = new XMLVariableDeclsImportContext(
rImport, *this, nPrefix, rLocalName, VarTypeUserField); rImport, *this, nPrefix, rLocalName, VarTypeUserField);
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2227,7 +2227,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{ {
pContext = new XMLDdeFieldDeclsImportContext( pContext = new XMLDdeFieldDeclsImportContext(
rImport, nPrefix, rLocalName); rImport, nPrefix, rLocalName);
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2242,7 +2242,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
pContext = new XMLTextFrameContext( rImport, nPrefix, pContext = new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList, rLocalName, xAttrList,
eAnchorType ); eAnchorType );
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2257,7 +2257,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
pContext = new XMLTextFrameHyperlinkContext( rImport, nPrefix, pContext = new XMLTextFrameHyperlinkContext( rImport, nPrefix,
rLocalName, xAttrList, rLocalName, xAttrList,
eAnchorType ); eAnchorType );
bContent = sal_False; bContent = false;
} }
break; break;
@@ -2280,7 +2280,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
case XML_TOK_TEXT_TRACKED_CHANGES: case XML_TOK_TEXT_TRACKED_CHANGES:
pContext = new XMLTrackedChangesImportContext( rImport, nPrefix, pContext = new XMLTrackedChangesImportContext( rImport, nPrefix,
rLocalName); rLocalName);
bContent = sal_False; bContent = false;
break; break;
case XML_TOK_TEXT_CHANGE: case XML_TOK_TEXT_CHANGE:
@@ -2295,7 +2295,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
case XML_TOK_TEXT_FORMS: case XML_TOK_TEXT_FORMS:
pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName); pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
bContent = sal_False; bContent = false;
break; break;
case XML_TOK_TEXT_AUTOMARK: case XML_TOK_TEXT_AUTOMARK:
@@ -2303,12 +2303,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
{ {
pContext = new XMLAutoMarkFileContext(rImport, nPrefix,rLocalName); pContext = new XMLAutoMarkFileContext(rImport, nPrefix,rLocalName);
} }
bContent = sal_False; bContent = false;
break; break;
case XML_TOK_TEXT_CALCULATION_SETTINGS: case XML_TOK_TEXT_CALCULATION_SETTINGS:
pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList); pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList);
bContent = sal_False; bContent = false;
break; break;
default: default:
@@ -2319,7 +2319,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
Reference < XShapes > xShapes; Reference < XShapes > xShapes;
pContext = rImport.GetShapeImport()->CreateGroupChildContext( pContext = rImport.GetShapeImport()->CreateGroupChildContext(
rImport, nPrefix, rLocalName, xAttrList, xShapes ); rImport, nPrefix, rLocalName, xAttrList, xShapes );
bContent = sal_False; bContent = false;
} }
} }

2
xmloff/source/text/txtparai.cxx
View File

@@ -1828,7 +1828,7 @@ XMLParaContext::XMLParaContext(
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList, const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bHead ) : bool bHead ) :
SvXMLImportContext( rImport, nPrfx, rLName ), SvXMLImportContext( rImport, nPrfx, rLName ),
xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ), xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
m_bHaveAbout(false), m_bHaveAbout(false),

4
xmloff/source/text/txtparai.hxx
View File

@@ -49,7 +49,7 @@ class XMLParaContext : public SvXMLImportContext
// Lost outline numbering in master document (#i73509#) // Lost outline numbering in master document (#i73509#)
sal_Bool mbOutlineLevelAttrFound; sal_Bool mbOutlineLevelAttrFound;
sal_Bool bIgnoreLeadingSpace; sal_Bool bIgnoreLeadingSpace;
sal_Bool bHeading; bool bHeading;
sal_Bool bIsListHeader; sal_Bool bIsListHeader;
sal_Bool bIsRestart; sal_Bool bIsRestart;
sal_Int16 nStartValue; sal_Int16 nStartValue;
@@ -64,7 +64,7 @@ public:
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
sal_Bool bHeading ); bool bHeading );
virtual ~XMLParaContext(); virtual ~XMLParaContext();