diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:28:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:30:59 +0200 |
| commit | 378dd762ee6e77fcc8aa27d9b24e35424f2dcf28 (patch) | |
| tree | 035ddac18e7cc959cad4f669b0dd8589405a038e /oox | |
| parent | 2339a5bd5088f20aad8746821ea2dcc656edb8ac (diff) | |
More loplugin:simplifybool
Change-Id: Ibfa82d0d397b87b1ca46f1edf9ad7609f8fa4167
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/titleconverter.cxx | 2 | ||||
| -rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 79863f56d1c4..6e6b44066a2c 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -245,7 +245,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) aPropSet.setProperty( PROP_AnchorPosition, eLegendPos ); aPropSet.setProperty( PROP_Expansion, eLegendExpand ); - if(eLegendPos == LegendPosition_CUSTOM && bTopRight && bManualLayout==false) + if(eLegendPos == LegendPosition_CUSTOM && bTopRight && !bManualLayout) aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos)); } catch( Exception& ) diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 9fab15574663..91af9e1cc031 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -93,19 +93,19 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal { // pcNameBeg points to begin of attribute name, find equality sign const sal_Char* pcEqualSign = lclFindCharacter( pcNameBeg, pcEnd, '=' ); - if ((bOk = (pcEqualSign < pcEnd)) == true) + if ((bOk = (pcEqualSign < pcEnd))) { // find end of attribute name (ignore whitespace between name and equality sign) const sal_Char* pcNameEnd = lclTrimWhiteSpaceFromEnd( pcNameBeg, pcEqualSign ); - if( (bOk = (pcNameBeg < pcNameEnd)) == true ) + if( (bOk = (pcNameBeg < pcNameEnd)) ) { // find begin of attribute value (must be single or double quote) const sal_Char* pcValueBeg = lclFindNonWhiteSpace( pcEqualSign + 1, pcEnd ); - if( (bOk = (pcValueBeg < pcEnd) && ((*pcValueBeg == '\'') || (*pcValueBeg == '"'))) == true ) + if( (bOk = (pcValueBeg < pcEnd) && ((*pcValueBeg == '\'') || (*pcValueBeg == '"'))) ) { // find end of attribute value (matching quote character) const sal_Char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg ); - if( (bOk = (pcValueEnd < pcEnd)) == true ) + if( (bOk = (pcValueEnd < pcEnd)) ) { ++pcValueEnd; OString aAttribName( pcNameBeg, static_cast< sal_Int32 >( pcNameEnd - pcNameBeg ) ); @@ -120,7 +120,7 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal aAttributes[ pcNameBeg ] = aAttribData; // continue with next attribute (skip whitespace after this attribute) pcNameBeg = pcValueEnd; - if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg )) == true) ) + if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg ))) ) pcNameBeg = lclFindNonWhiteSpace( pcNameBeg + 1, pcEnd ); } } |