Kaydet (Commit) 8d8e8942 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#83062 infinite recursion

regression from

commit 7c03fc2f
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
üst 72f4f0e9
...@@ -570,6 +570,10 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() ...@@ -570,6 +570,10 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
} }
else else
{ {
// To not run in a depth loop, use a coloring algorithm on
// SdrEdgeObj BoundRect calculations
mbBoundRectCalculationRunning = true;
if(mbSuppressed) if(mbSuppressed)
{ {
// #i123048# If layouting was ever suppressed, it needs to be done once // #i123048# If layouting was ever suppressed, it needs to be done once
...@@ -581,10 +585,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() ...@@ -581,10 +585,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
mbSuppressed = false; 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(); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
SetRectsDirty(); SetRectsDirty();
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment