summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-27 16:40:58 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-08-27 11:18:36 -0500
commita960cfc28bc37f7a22b6cb43511be2c64fd31b19 (patch)
tree8930c0543543371382e0eb897cd6d0d0f1a49e29
parent767850c68e8362661df06c6ee234cfb65d078121 (diff)
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@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--svx/source/svdraw/svdoedge.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index c25513de3c6f..5f0cacaeb27f 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);