svx/source/sdr/primitive2d/sdrattributecreator.cxx | 3 ++- svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 15267a69e0e0b57c32f1289f1545fa82a4ddfc1f Author: matteocam <matteo.campane...@gmail.com> Date: Tue Jul 29 20:52:32 2014 +0300 Chaining only out of edit mode. No reset of chaining status in SdrTextObj Change-Id: I1c7741c161f4fb76407393d3e84c331b20c353a1 diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index fc22e83..48fcd71 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -525,9 +525,10 @@ namespace drawinglayer bool bToBeChained = rTextObj.IsToBeChained(); // for resetting status // XXX: may not work + // XXX: this should happen only whether the chaining has occurred though. if ( rTextObj.IsToBeChained() ) { // XXX: hack - const_cast<SdrTextObj*>(&rTextObj)->SetToBeChained( false ); + //const_cast<SdrTextObj*>(&rTextObj)->SetToBeChained( false ); } if(rText.GetOutlinerParaObject() && rText.GetModel()) diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index db79a85..cc5c4a4 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -305,7 +305,7 @@ namespace drawinglayer // isotrophically scaled text in range pNew = new SdrAutoFitTextPrimitive2D(&rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap); } - else if( rText.isToBeChained() ) // FIXME(matteocam) + else if( rText.isToBeChained() && !isInEditMode() ) // FIXME(matteocam) { //bool b = true; // XXX: Chained Text by default! //if (b) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits