diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-08-27 16:40:58 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-27 16:41:06 +0100 |
commit | 8d8e8942b2ee2a2e85c65d71628057316c9f5897 (patch) | |
tree | 6c2a10a80f45a790c59ec08e3a57da7486ae2899 /svx | |
parent | Resolves: fdo#83137 NULL pAction (diff) | |
download | core-8d8e8942b2ee2a2e85c65d71628057316c9f5897.tar.gz core-8d8e8942b2ee2a2e85c65d71628057316c9f5897.zip |
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
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 68665776f134..1e690bfe8b78 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); |