diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-27 16:40:58 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-08-28 04:53:06 -0500 |
| commit | 111c7d6773f7cae554d0f235eef00d774309525a (patch) | |
| tree | 7fe6ab1ff52787d94a13407e45dc2a2b1b1ec331 | |
| parent | 8e01c3fc925b714f4b77ca9c51d7a9973276f577 (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
(cherry picked from commit 8d8e8942b2ee2a2e85c65d71628057316c9f5897)
Conflicts:
svx/source/svdraw/svdoedge.cxx
Change-Id: If5fce4b7a88d4d0972f52705334e4b9b48425cca
Reviewed-on: https://gerrit.libreoffice.org/11150
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -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 9e0b0ccf71a7..b5890e388125 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 = sal_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 algorythm on - // SdrEdgeObj BoundRect calculations - mbBoundRectCalculationRunning = sal_True; - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); SetRectsDirty(); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); |