include/svx/svdoedge.hxx | 4 ++++ sd/inc/glob.hrc | 2 +- sd/source/core/glob.src | 4 ---- svx/source/svdraw/svdoedge.cxx | 39 ++++++++++++++++++++++++--------------- 4 files changed, 29 insertions(+), 20 deletions(-)
New commits: commit 42f1ce529da6d65724aa1e9c9d579f3befa0f30f Author: Caolán McNamara <[email protected]> Date: Mon Sep 2 20:25:47 2013 +0100 unused string resource Change-Id: Icea434caf7a5de1131bcba72b2133f8643428ecd diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 3bf45ee..622ce93 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -71,7 +71,7 @@ #define STR_NOTES RID_GLOB_START+47 #define STR_HANDOUT RID_GLOB_START+48 #define STR_MASTERPAGE RID_GLOB_START+49 -#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED RID_GLOB_START+51 + #define STR_UNDO_MOVEPAGES RID_GLOB_START+52 #define STR_NOT_ENOUGH_MEMORY RID_GLOB_START+53 #define STR_LAYOUT_SUBTITLE RID_GLOB_START+54 diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index c2c1275..3e3350f 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -224,10 +224,6 @@ String STR_STANDARD_STYLESHEET_NAME { Text [ en-US ] = "Default" ; }; -String STR_BAD_PASSWORD_OR_FILE_CORRUPTED -{ - Text [ en-US ] = "The password is incorrect or the file is damaged." ; -}; String STR_UNDO_MOVEPAGES { Text [ en-US ] = "Move slides" ; commit 7c03fc2fe77f9b1f910f4ab395923e52648c32b5 Author: Armin Le Grand <[email protected]> Date: Mon Sep 2 14:30:09 2013 +0000 Related: #i123048# Corrected connector layout after reload (cherry picked from commit c7d96eed93415894c5ca4522bd32ca06acd88233) Conflicts: svx/inc/svx/svdoedge.hxx svx/source/svdraw/svdoedge.cxx Change-Id: Id388fa7396751a2e8b5908373ca57eceee1a1af1 diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index a7469be..580cf1e 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -182,6 +182,10 @@ protected: // is running, the flag is set, else it is always sal_False. unsigned mbBoundRectCalculationRunning : 1; + // #i123048# need to remember if layouting was suppressed before to get + // to a correct state for first real layouting + unsigned mbSuppressed : 1; + public: // #109007# // Interface to default connect suppression diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 9cd1071..afb70f3 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -174,7 +174,8 @@ SdrEdgeObj::SdrEdgeObj() bEdgeTrackUserDefined(sal_False), // Default is to allow default connects mbSuppressDefaultConnect(sal_False), - mbBoundRectCalculationRunning(sal_False) + mbBoundRectCalculationRunning(sal_False), + mbSuppressed(false) { bClosedObj=sal_False; bIsEdge=sal_True; @@ -546,12 +547,20 @@ void SdrEdgeObj::ImpUndirtyEdgeTrack() void SdrEdgeObj::ImpRecalcEdgeTrack() { - // #i120437# if bEdgeTrackUserDefined, do not recalculate. Also not when model locked - if(bEdgeTrackUserDefined || !GetModel() || GetModel()->isLocked()) + // #i120437# if bEdgeTrackUserDefined, do not recalculate + if(bEdgeTrackUserDefined) { return; } + // #i120437# also not when model locked during import, but remember + if(!GetModel() || GetModel()->isLocked()) + { + mbSuppressed = true; + return; + } + + // #i110649# if(IsBoundRectCalculationRunning()) { // This object is involved into another ImpRecalcEdgeTrack() call @@ -559,20 +568,20 @@ 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 - // #i45294# but calculate EdgeTrack and secure properties there - mbBoundRectCalculationRunning = sal_True; - *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); - ImpSetAttrToEdgeInfo(); - bEdgeTrackDirty=sal_False; - mbBoundRectCalculationRunning = sal_False; - } else { - // To not run in a depth loop, use a coloring algorithm on + if(mbSuppressed) + { + // #i123048# If layouting was ever suppressed, it needs to be done once + // and the attr need to be set at EdgeInfo, else these attr *will be lost* + // in the following call to ImpSetEdgeInfoToAttr() sice they were never + // set before (!) + *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); + ImpSetAttrToEdgeInfo(); + mbSuppressed = false; + } + + // To not run in a depth loop, use a coloring algorythm on // SdrEdgeObj BoundRect calculations mbBoundRectCalculationRunning = sal_True;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
