[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests sdext/source

[Caolán McNamara (via logerrit)]

 qadevOOo/tests/java/ifc/text/_XText.java           |    2 +-
 sdext/source/pdfimport/tree/writertreevisiting.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bb6f5ae90332fee2eb650398d1ae0b554ac89ce2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 24 10:57:27 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 24 21:33:38 2019 +0200

    cid#1448446 Unchecked dynamic_cast
    
    Change-Id: I790f55e5edfce37b28dfc8b915970e123425f434
    Reviewed-on: https://gerrit.libreoffice.org/76244
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index b84e5f2fcb07..96b9e4bcfab9 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -671,8 +671,8 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
     auto it = std::find_if(rElem.Children.begin(), rElem.Children.end(), isParagraphElement);
     if (it != rElem.Children.end())
     {
-        ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(it->get());
-        if( pPara->y+pPara->h < rElem.h*0.15 && pPara->isSingleLined( m_rProcessor ) )
+        ParagraphElement& rPara = dynamic_cast<ParagraphElement&>(*it->get());
+        if( rPara.y+rPara.h < rElem.h*0.15 && rPara.isSingleLined( m_rProcessor ) )
         {
             auto next_it = it;
             ParagraphElement* pNextPara = nullptr;
@@ -680,10 +680,10 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
             {
                 pNextPara = dynamic_cast<ParagraphElement*>(next_it->get());
             }
-            if( pNextPara && pNextPara->y > pPara->y+pPara->h*2 )
+            if( pNextPara && pNextPara->y > rPara.y+rPara.h*2 )
             {
                 rElem.HeaderElement = std::move(*it);
-                pPara->Parent = nullptr;
+                rPara.Parent = nullptr;
                 rElem.Children.erase( it );
             }
         }
commit 1779f7fcbaf11428e9064653a61045dc267778be
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 24 11:43:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 24 21:33:14 2019 +0200

    cid#1448285 RV: Bad use of return value
    
    Change-Id: I3509620b37884b75a00c89ae38b68adc324da00c
    Reviewed-on: https://gerrit.libreoffice.org/76252
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/qadevOOo/tests/java/ifc/text/_XText.java b/qadevOOo/tests/java/ifc/text/_XText.java
index 234dd5f1882f..0e2d8a3d6ea9 100644
--- a/qadevOOo/tests/java/ifc/text/_XText.java
+++ b/qadevOOo/tests/java/ifc/text/_XText.java
@@ -145,7 +145,7 @@ public class _XText extends MultiMethodTest {
         }
         catch( com.sun.star.container.NoSuchElementException nseE ){
             // Some exception.FAILED
-            Status.failed( nseE.toString() );
+            log.println(nseE.toString());
             return;
         }