[Libreoffice-commits] core.git: embeddedobj/source sdext/source soltools/mkdepend sw/source

[Libreoffice Gerrit user]

 embeddedobj/source/commonembedding/persistence.cxx |   10 +---------
 sdext/source/pdfimport/test/pdfunzip.cxx           |   10 ++++------
 soltools/mkdepend/pr.c                             |    2 +-
 sw/source/core/text/porlay.cxx                     |    6 +++---
 4 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit fff501a3393b459c512ec155e2d2cd935e7885a2
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Nov 26 10:36:52 2018 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Dec 1 18:20:24 2018 +0100

    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 at collabora.com>

diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 06562ac39682..aae1180f8d8b 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1771,7 +1771,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
     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 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
                                             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!",
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 17807af628d6..ca7e5afa0b1a 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -311,9 +311,8 @@ static int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile*
 
 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 @@ static int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile*
         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 @@ static int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile
         aContext.m_bDecrypt = i_pPDFFile->isEncrypted();
         pStream->writeStream( aContext, i_pPDFFile );
     }
-    return nRet;
+    return 0;
 }
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index 4fe0b4ada2fa..391e39dfcd20 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -59,7 +59,7 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist
     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);
         }
 
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 02900e9e5d79..781c8aef5302 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1510,7 +1510,7 @@ sal_Int32 SwScriptInfo::MaskHiddenRanges( const SwTextNode& rNode, OUStringBuffe
 
         while ( nHiddenStart < nHiddenEnd && nHiddenStart < nEnd )
         {
-            if ( nHiddenStart >= nStt && nHiddenStart < nEnd )
+            if (nHiddenStart >= nStt)
             {
                 rText[nHiddenStart] = cChar;
                 ++nNumOfHiddenChars;
@@ -1605,7 +1605,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTextNode& rNode, sal_Int32 nP
 
             if ( nHiddenStart > nPos )
                 break;
-            if ( nHiddenStart <= nPos && nPos < nHiddenEnd )
+            if (nPos < nHiddenEnd)
             {
                 rnStartPos = nHiddenStart;
                 rnEndPos   = std::min<sal_Int32>(nHiddenEnd,
@@ -1644,7 +1644,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange(TextFrameIndex nPos,
 
         if ( nHiddenStart > nPos )
             break;
-        if ( nHiddenStart <= nPos && nPos < nHiddenEnd )
+        if (nPos < nHiddenEnd)
         {
             rnStartPos = nHiddenStart;
             rnEndPos   = nHiddenEnd;