diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:30:45 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:39:07 +0200 |
commit | 22401181774dfb3882e7ad0335f1267d7885ff48 (patch) | |
tree | cc31d4ef17eef1e76458e47cef8675458c8719ea /xmloff | |
parent | 6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff) |
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes
Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/meta/xmlmetae.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/WordWrapPropertyHdl.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtlists.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/Oasis2OOo.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index b2688612a53f..73e89045c66f 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -526,7 +526,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( { // draw:polygon or draw:polyline inside group context pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, - rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? sal_True : sal_False, bTemporaryShape ); + rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? true : false, bTemporaryShape ); break; } case XML_TOK_GROUP_PATH: diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 27ae8593386a..63093896a604 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -443,7 +443,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName, // finally, start the element // #i107240# no whitespace here, because the DOM may already contain // whitespace, which is not cleared when loading and thus accumulates. - mrExport.StartElement(i_rName, (m_level > 1) ? sal_False : sal_True); + mrExport.StartElement(i_rName, (m_level > 1) ? false : true); ++m_level; } diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 6c68a766fb75..aa2205dd6cb3 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -64,10 +64,10 @@ bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu if( nUPD == 300 ) { if( ( nBuildId > 0 ) && (nBuildId < 9316 ) ) - bValue = bValue ? sal_False : sal_True; // treat OOo 3.0 beta1 as OOo 2.x + bValue = bValue ? false : true; // treat OOo 3.0 beta1 as OOo 2.x } else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) ) - bValue = bValue ? sal_False : sal_True; + bValue = bValue ? false : true; } rValue <<= bValue; } diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 2343364dbaf9..95b207ac147f 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -329,7 +329,7 @@ bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) { return mpListStack != 0 ? sListId == mpListStack->back().second - : sal_False; + : false; } OUString @@ -472,7 +472,7 @@ XMLTextListsHelper::MakeNumRule( } } - bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : sal_False); + bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : false); if ( !xNumRules.is() ) { // If no style name has been specified for this style and for any diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 461b8776ddb4..56bc8c6ceecc 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1655,7 +1655,7 @@ XMLTransformerContext *Oasis2OOoTransformer::CreateUserDefinedContext( const XMLTransformerContext *pCurrent = GetCurrentContext(); return new XMLControlOASISTransformerContext( *this, rQName, pCurrent ? pCurrent->HasQName( XML_NAMESPACE_FORM, - XML_FORM ) : sal_False ); + XML_FORM ) : false ); } case XML_ETACTION_FORM_PROPERTY: return new XMLFormPropOASISTransformerContext( *this, rQName, |