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

More loplugin:simplifybool

Change-Id: Ibfa82d0d397b87b1ca46f1edf9ad7609f8fa4167
üst 2339a5bd
...@@ -245,7 +245,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) ...@@ -245,7 +245,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
aPropSet.setProperty( PROP_AnchorPosition, eLegendPos ); aPropSet.setProperty( PROP_AnchorPosition, eLegendPos );
aPropSet.setProperty( PROP_Expansion, eLegendExpand ); aPropSet.setProperty( PROP_Expansion, eLegendExpand );
if(eLegendPos == LegendPosition_CUSTOM && bTopRight && bManualLayout==false) if(eLegendPos == LegendPosition_CUSTOM && bTopRight && !bManualLayout)
aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos)); aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos));
} }
catch( Exception& ) catch( Exception& )
......
...@@ -93,19 +93,19 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal ...@@ -93,19 +93,19 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal
{ {
// pcNameBeg points to begin of attribute name, find equality sign // pcNameBeg points to begin of attribute name, find equality sign
const sal_Char* pcEqualSign = lclFindCharacter( pcNameBeg, pcEnd, '=' ); 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) // find end of attribute name (ignore whitespace between name and equality sign)
const sal_Char* pcNameEnd = lclTrimWhiteSpaceFromEnd( pcNameBeg, pcEqualSign ); 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) // find begin of attribute value (must be single or double quote)
const sal_Char* pcValueBeg = lclFindNonWhiteSpace( pcEqualSign + 1, pcEnd ); 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) // find end of attribute value (matching quote character)
const sal_Char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg ); const sal_Char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg );
if( (bOk = (pcValueEnd < pcEnd)) == true ) if( (bOk = (pcValueEnd < pcEnd)) )
{ {
++pcValueEnd; ++pcValueEnd;
OString aAttribName( pcNameBeg, static_cast< sal_Int32 >( pcNameEnd - pcNameBeg ) ); OString aAttribName( pcNameBeg, static_cast< sal_Int32 >( pcNameEnd - pcNameBeg ) );
...@@ -120,7 +120,7 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal ...@@ -120,7 +120,7 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal
aAttributes[ pcNameBeg ] = aAttribData; aAttributes[ pcNameBeg ] = aAttribData;
// continue with next attribute (skip whitespace after this attribute) // continue with next attribute (skip whitespace after this attribute)
pcNameBeg = pcValueEnd; pcNameBeg = pcValueEnd;
if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg )) == true) ) if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg ))) )
pcNameBeg = lclFindNonWhiteSpace( pcNameBeg + 1, pcEnd ); pcNameBeg = lclFindNonWhiteSpace( pcNameBeg + 1, pcEnd );
} }
} }
......
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