summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdoedge.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-07 16:33:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-07 16:33:57 +0000
commit3c121543aa9c5d039e23a02c299a11aad18df253 (patch)
tree0572f7956d02bc8ac15377f59ffaca1214a1969c /svx/source/svdraw/svdoedge.cxx
parentf312ce1eee04a82f4b6f08d7e05c6cbf98d9995f (diff)
INTEGRATION: CWS aw028 (1.29.260); FILE MERGED
2005/02/25 20:37:27 aw 1.29.260.2: RESYNC: (1.29-1.30); FILE MERGED 2005/02/25 19:18:40 aw 1.29.260.1: #i43068#
Diffstat (limited to 'svx/source/svdraw/svdoedge.cxx')
-rw-r--r--svx/source/svdraw/svdoedge.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 783ab133d121..28238638b0ae 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svdoedge.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: vg $ $Date: 2005-02-16 17:56:25 $
+ * last change: $Author: vg $ $Date: 2005-03-07 17:33:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -841,6 +841,11 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
// Also, do not change bEdgeTrackDirty so that it gets recalculated
// later at the first non-looping call.
}
+ // #i43068#
+ else if(GetModel() && GetModel()->isLocked())
+ {
+ // avoid re-layout during imports/API call sequences
+ }
else
{
// To not run in a depth loop, use a coloring algorythm on