diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-06-14 14:04:07 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2015-06-14 14:04:07 +0200 |
| commit | 4d8cccbdacc58ee2def5cc38a4ef92734414aac2 (patch) | |
| tree | 61683669576367bb3d60dd9f34417d539feff3af /xmloff | |
| parent | b226928c6d5d094359b970b64a063b243d4fc84c (diff) | |
cppcheck: redundantCondition [part2]
Change-Id: I23e8a4834fa7858adb292ce0a4dfa5dab1ab5f00
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/ProgressBarHelper.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index f8a44452939d..719ab804e3ad 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -68,7 +68,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue) { if (xStatusIndicator.is() && (nReference > 0)) { - if ((nTempValue >= nValue) && (!bStrict || (bStrict && (nTempValue <= nReference)))) + if ((nTempValue >= nValue) && (!bStrict || (nTempValue <= nReference))) { // #91317# no progress bar with values > 100% if (nTempValue > nReference) diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index fa9375738ff5..8dd4b0266576 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -532,14 +532,14 @@ void XMLPageMasterExportPropMapper::ContextFilter( aHeaderBuffer.ContextFilter( rPropState ); aFooterBuffer.ContextFilter( rPropState ); - if( pPMHeaderHeight && (!pPMHeaderDynamic || (pPMHeaderDynamic && getBOOL( pPMHeaderDynamic->maValue ))) ) + if( pPMHeaderHeight && (!pPMHeaderDynamic || getBOOL( pPMHeaderDynamic->maValue )) ) lcl_RemoveState( pPMHeaderHeight ); if( pPMHeaderMinHeight && pPMHeaderDynamic && !getBOOL( pPMHeaderDynamic->maValue ) ) lcl_RemoveState( pPMHeaderMinHeight ); if( pPMHeaderDynamic ) lcl_RemoveState( pPMHeaderDynamic ); - if( pPMFooterHeight && (!pPMFooterDynamic || (pPMFooterDynamic && getBOOL( pPMFooterDynamic->maValue ))) ) + if( pPMFooterHeight && (!pPMFooterDynamic || getBOOL( pPMFooterDynamic->maValue )) ) lcl_RemoveState( pPMFooterHeight ); if( pPMFooterMinHeight && pPMFooterDynamic && !getBOOL( pPMFooterDynamic->maValue ) ) lcl_RemoveState( pPMFooterMinHeight ); |