Kaydet (Commit) ba15d30e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:simplifybool

Change-Id: I4a7ba9192956941f05e68ae8df3263d609a7c4dc
üst b919eeaa
...@@ -526,7 +526,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( ...@@ -526,7 +526,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
{ {
// draw:polygon or draw:polyline inside group context // draw:polygon or draw:polyline inside group context
pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes,
rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? true : false, bTemporaryShape ); rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON, bTemporaryShape );
break; break;
} }
case XML_TOK_GROUP_PATH: case XML_TOK_GROUP_PATH:
......
...@@ -443,7 +443,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName, ...@@ -443,7 +443,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName,
// finally, start the element // finally, start the element
// #i107240# no whitespace here, because the DOM may already contain // #i107240# no whitespace here, because the DOM may already contain
// whitespace, which is not cleared when loading and thus accumulates. // whitespace, which is not cleared when loading and thus accumulates.
mrExport.StartElement(i_rName, (m_level > 1) ? false : true); mrExport.StartElement(i_rName, m_level <= 1);
++m_level; ++m_level;
} }
......
...@@ -64,10 +64,10 @@ bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu ...@@ -64,10 +64,10 @@ bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu
if( nUPD == 300 ) if( nUPD == 300 )
{ {
if( ( nBuildId > 0 ) && (nBuildId < 9316 ) ) if( ( nBuildId > 0 ) && (nBuildId < 9316 ) )
bValue = bValue ? false : true; // treat OOo 3.0 beta1 as OOo 2.x bValue = !bValue; // treat OOo 3.0 beta1 as OOo 2.x
} }
else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) ) else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) )
bValue = bValue ? false : true; bValue = !bValue;
} }
rValue <<= bValue; rValue <<= bValue;
} }
......
...@@ -327,9 +327,7 @@ void XMLTextListsHelper::PopListFromStack() ...@@ -327,9 +327,7 @@ void XMLTextListsHelper::PopListFromStack()
bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) const bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) const
{ {
return mpListStack != 0 return mpListStack != 0 && sListId == mpListStack->back().second;
? sListId == mpListStack->back().second
: false;
} }
OUString OUString
...@@ -472,7 +470,7 @@ XMLTextListsHelper::MakeNumRule( ...@@ -472,7 +470,7 @@ XMLTextListsHelper::MakeNumRule(
} }
} }
bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : false); bool bSetDefaults(io_pSetDefaults && *io_pSetDefaults);
if ( !xNumRules.is() ) if ( !xNumRules.is() )
{ {
// If no style name has been specified for this style and for any // If no style name has been specified for this style and for any
......
...@@ -1654,8 +1654,8 @@ XMLTransformerContext *Oasis2OOoTransformer::CreateUserDefinedContext( ...@@ -1654,8 +1654,8 @@ XMLTransformerContext *Oasis2OOoTransformer::CreateUserDefinedContext(
{ {
const XMLTransformerContext *pCurrent = GetCurrentContext(); const XMLTransformerContext *pCurrent = GetCurrentContext();
return new XMLControlOASISTransformerContext( *this, rQName, return new XMLControlOASISTransformerContext( *this, rQName,
pCurrent ? pCurrent->HasQName( XML_NAMESPACE_FORM, pCurrent && pCurrent->HasQName( XML_NAMESPACE_FORM,
XML_FORM ) : false ); XML_FORM ) );
} }
case XML_ETACTION_FORM_PROPERTY: case XML_ETACTION_FORM_PROPERTY:
return new XMLFormPropOASISTransformerContext( *this, rQName, return new XMLFormPropOASISTransformerContext( *this, rQName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment