commit fff501a3393b459c512ec155e2d2cd935e7885a2
author Mike Kaganski <mike.kaganski@collabora.com> Mon Nov 26 10:36:52 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Sat Dec 01 18:20:24 2018 +0100
tree 625ea119195475e2680ba7f1be1c73b2a31a0684
parent af843af4c816ef25246c815e187729ec25b2f000

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

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

embeddedobj/source/commonembedding/persistence.cxx

diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 06562ac..aae1180 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1771,7 +1771,7 @@
    if ( m_bDisposed )
        throw lang::DisposedException(); // TODO

    if ( !m_bIsLink )
    if (!m_bIsLink || m_nObjectState == -1)
    {
        // it must be a linked initialized object
        throw embed::WrongStateException(
@@ -1791,14 +1791,6 @@
                                            static_cast< ::cppu::OWeakObject* >(this),
                                            2 );

    if ( !m_bIsLink || m_nObjectState == -1 )
    {
        // it must be a linked initialized object
        throw embed::WrongStateException(
                    "The object is not a valid linked object!",
                    static_cast< ::cppu::OWeakObject* >(this) );
    }

    if ( m_bWaitSaveCompleted )
        throw embed::WrongStateException(
                    "The object waits for saveCompleted() call!",

sdext/source/pdfimport/test/pdfunzip.cxx

diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 17807af..ca7e5af 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -311,9 +311,8 @@

static int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
{
    int nRet = 0;
    unsigned int nElements = i_pPDFFile->m_aSubElements.size();
    for( unsigned i = 0; i < nElements && nRet == 0; i++ )
    for (unsigned i = 0; i < nElements; i++)
    {
        // search FontDescriptors
        PDFObject* pObj = dynamic_cast<PDFObject*>(i_pPDFFile->m_aSubElements[i].get());
@@ -390,16 +389,15 @@
        aContext.m_bDecrypt = i_pPDFFile->isEncrypted();
        pStream->writeStream( aContext, i_pPDFFile );
    }
    return nRet;
    return 0;
}

static std::vector< std::pair< sal_Int32, sal_Int32 > > s_aEmitObjects;

static int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
{
    int nRet = 0;
    unsigned int nElements = s_aEmitObjects.size();
    for( unsigned i = 0; i < nElements && nRet == 0; i++ )
    for (unsigned i = 0; i < nElements; i++)
    {
        sal_Int32 nObject     = s_aEmitObjects[i].first;
        sal_Int32 nGeneration = s_aEmitObjects[i].second;
@@ -419,7 +417,7 @@
        aContext.m_bDecrypt = i_pPDFFile->isEncrypted();
        pStream->writeStream( aContext, i_pPDFFile );
    }
    return nRet;
    return 0;
}

SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )

soltools/mkdepend/pr.c

diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index 4fe0b4ad..391e39d 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -59,7 +59,7 @@
    if (newfile) {

        /* Only add new dependency files if they don't have "/usr/include" in them. */
        if (!(newfile && newfile->i_file && strstr(newfile->i_file, "/usr/"))) {
        if (!(newfile->i_file && strstr(newfile->i_file, "/usr/"))) {
            included_by(file, newfile);
        }

sw/source/core/text/porlay.cxx

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 02900e9..781c8ae 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1510,7 +1510,7 @@

        while ( nHiddenStart < nHiddenEnd && nHiddenStart < nEnd )
        {
            if ( nHiddenStart >= nStt && nHiddenStart < nEnd )
            if (nHiddenStart >= nStt)
            {
                rText[nHiddenStart] = cChar;
                ++nNumOfHiddenChars;
@@ -1605,7 +1605,7 @@

            if ( nHiddenStart > nPos )
                break;
            if ( nHiddenStart <= nPos && nPos < nHiddenEnd )
            if (nPos < nHiddenEnd)
            {
                rnStartPos = nHiddenStart;
                rnEndPos   = std::min<sal_Int32>(nHiddenEnd,
@@ -1644,7 +1644,7 @@

        if ( nHiddenStart > nPos )
            break;
        if ( nHiddenStart <= nPos && nPos < nHiddenEnd )
        if (nPos < nHiddenEnd)
        {
            rnStartPos = nHiddenStart;
            rnEndPos   = nHiddenEnd;