Kaydet (Commit) 14301589 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

style fix for cppcheck redundantCondition

Change-Id: I5d02c6f4c6b411c23a6de43374884a76e1c408fe
Reviewed-on: https://gerrit.libreoffice.org/30667Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f9028f19
......@@ -353,7 +353,7 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeExceptio
// VCL list boxes in DropDown-Mode else <const>PANEL</const>.
// This way the Java bridge has not to handle both independently.
//return m_bIsDropDownBox ? AccessibleRole::COMBO_BOX : AccessibleRole::PANEL;
if (m_bIsDropDownBox || (!m_bIsDropDownBox && m_aBoxType == COMBOBOX ))
if (m_bIsDropDownBox || (m_aBoxType == COMBOBOX))
return AccessibleRole::COMBO_BOX;
else
return AccessibleRole::PANEL;
......
......@@ -282,7 +282,7 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti
aRet = TXChild::queryInterface( rType);
return aRet;
}
else if(!m_pTable || (m_pTable && !m_pTable->isNew()))
else if(!m_pTable || !m_pTable->isNew())
{
if(!m_bAddColumn && rType == cppu::UnoType<XAppend>::get())
return Any();
......
......@@ -148,7 +148,7 @@ void SAL_CALL renderDataAndSetupStgMedium(
const sal_Int8* lpStorage, const FORMATETC& fetc, sal_uInt32 nInitStgSize,
sal_uInt32 nBytesToTransfer, STGMEDIUM& stgmedium )
{
OSL_PRECOND( !nInitStgSize || nInitStgSize && (nInitStgSize >= nBytesToTransfer),
OSL_PRECOND( !nInitStgSize || (nInitStgSize >= nBytesToTransfer),
"Memory size less than number of bytes to transfer" );
CStgTransferHelper stgTransfHelper( AUTO_INIT );
......
......@@ -622,7 +622,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
// kind of optimization: treat empty files as nonexistent files
// and write to such files directly. Note that "Size" property is optional.
bool bHasSizeProperty = aAny >>= aSize;
if( !bHasSizeProperty || ( bHasSizeProperty && aSize ) )
if( !bHasSizeProperty || aSize )
{
uno::Reference < XActiveDataSink > xSink = new ZipPackageSink;
if ( aContent.openStream ( xSink ) )
......
......@@ -1235,7 +1235,7 @@ void SdTiledRenderingTest::testCreateViewTextCursor()
{
auto itVisibility = aView1.m_aViewCursorVisibilities.find(rInvalidation.first);
// For each cursor invalidation: if there is no visibility or the visibility is true, that's a problem.
if (itVisibility == aView1.m_aViewCursorVisibilities.end() || (itVisibility != aView1.m_aViewCursorVisibilities.end() && itVisibility->second))
if (itVisibility == aView1.m_aViewCursorVisibilities.end() || itVisibility->second)
{
bFoundCursor = true;
break;
......
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