commit 7eebdd24ee72a8deef869eca53103094632aeb59
author Mike Kaganski <mike.kaganski@collabora.com> Sun Nov 11 23:02:05 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Sun Nov 11 22:24:02 2018 +0100
tree f3ee02967333524148e76fa4ae5268822c961a4f
parent 50519e036a2707aca59cc8a7b58c4fdd7aeff580

tdf#120703 PVS: V560 A part of conditional expression is always true/false

Change-Id: I08ea67c1b51ee04258ce7769bfe9d97a1cb46b22
Reviewed-on: https://gerrit.libreoffice.org/63268
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

dbaccess/source/ui/browser/brwctrlr.cxx

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 4fab483..5db15ad 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1479,7 +1479,7 @@
                            aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly;
                            if(aReturn.bEnabled)
                            {
                                aReturn.bEnabled = aReturn.bEnabled && IsFormatSupported( m_aSystemClipboard.GetDataFlavorExVector(), SotClipboardFormatId::STRING );
                                aReturn.bEnabled = IsFormatSupported( m_aSystemClipboard.GetDataFlavorExVector(), SotClipboardFormatId::STRING );
                            }
                            break;
                    }

sw/source/core/attr/calbck.cxx

diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index d0ce0d8..62ce749 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -82,8 +82,9 @@
    if( !pOld || pOld->Which() != RES_OBJECTDYING )
        return nullptr;

    assert(dynamic_cast<const SwPtrMsgPoolItem*>(pOld));
    const SwPtrMsgPoolItem* pDead = static_cast<const SwPtrMsgPoolItem*>(pOld);
    if(!pDead || pDead->pObject != m_pRegisteredIn)
    if(pDead->pObject != m_pRegisteredIn)
    {
        // we should only care received death notes from objects we are following
        return nullptr;

sw/source/core/layout/calcmove.cxx

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 9594b91..72d74ed 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1701,6 +1701,8 @@
            nullptr != GetNextCellLeaf() )
            bDontMoveMe = false;

        assert(bMoveable);

        if ( bDontMoveMe && aRectFnSet.GetHeight(getFrameArea()) >
                            aRectFnSet.GetHeight(GetUpper()->getFramePrintArea()) )
        {
@@ -1725,7 +1727,7 @@
                 * Exception: If we sit in FormatWidthCols, we must not ignore
                 * the attributes.
                 */
                else if ( !bFootnote && bMoveable &&
                else if ( !bFootnote &&
                      ( !bFly || !FindFlyFrame()->IsColLocked() ) &&
                      ( !bSct || !FindSctFrame()->IsColLocked() ) )
                    bMoveOrFit = true;

ucb/source/cacher/cachedcontentresultset.cxx

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a1788a2..93db8c5 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1522,7 +1522,7 @@

        aGuard.reset();
        m_nRow = nNewRow;
        m_bAfterLast = !bValid && nNewRow > 0;
        m_bAfterLast = !bValid; // only nNewRow > 0 possible here
        return bValid;
    }
}