[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sdext/source svx/source

[Caolán McNamara]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    2 +-
 svx/source/svdraw/svdoedge.cxx                        |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a960cfc28bc37f7a22b6cb43511be2c64fd31b19
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 27 16:40:58 2014 +0100

    Resolves: fdo#83062 infinite recursion
    
    regression from
    
    commit 7c03fc2fe77f9b1f910f4ab395923e52648c32b5
    Date:   Mon Sep 2 14:30:09 2013 +0000
    Related: #i123048# Corrected connector layout after reload
    
    verified that #i123048# continues to work
    
    Change-Id: If5fce4b7a88d4d0972f52705334e4b9b48425cca
    (cherry picked from commit 8d8e8942b2ee2a2e85c65d71628057316c9f5897)
    Reviewed-on: https://gerrit.libreoffice.org/11149
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index c25513d..5f0caca 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -570,6 +570,10 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
     }
     else
     {
+        // To not run in a depth loop, use a coloring algorithm on
+        // SdrEdgeObj BoundRect calculations
+        mbBoundRectCalculationRunning = true;
+
         if(mbSuppressed)
         {
             // #i123048# If layouting was ever suppressed, it needs to be done once
@@ -581,10 +585,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
             mbSuppressed = false;
         }
 
-        // To not run in a depth loop, use a coloring algorithm on
-        // SdrEdgeObj BoundRect calculations
-        mbBoundRectCalculationRunning = true;
-
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
         SetRectsDirty();
         *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
commit 767850c68e8362661df06c6ee234cfb65d078121
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 27 15:43:35 2014 +0100

    Resolves: fdo#83137 NULL pAction
    
    Change-Id: I74c4e32aae1e3aa74d197f132c900627062b6d01
    (cherry picked from commit 72f4f0e9e7db6798ff002632d5bc19b72a671306)
    Reviewed-on: https://gerrit.libreoffice.org/11144
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e3a779e..129f2b9 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -572,7 +572,7 @@ void PDFOutDev::processLink(Link* link, Catalog*)
     link->getRect( &x1, &y1, &x2, &y2 );
 
     LinkAction* pAction = link->getAction();
-    if( pAction->getKind() == actionURI )
+    if (pAction && pAction->getKind() == actionURI)
     {
         const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();