[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
matteocam
matteo.campanelli at gmail.com
Thu Jun 4 23:27:35 PDT 2015
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 2 +-
svx/source/svdraw/svdotextdecomposition.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f35c45f99e49c4eb74f685b51eb38e68f340e1e7
Author: matteocam <matteo.campanelli at gmail.com>
Date: Fri Jun 5 02:26:57 2015 -0400
Also try to cut text in decomp. primitive (does not work perfectly)
Change-Id: Ia4e299915e7a3330d9a9dd4262184e6bf5075f8a
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 612a862..3267c8d 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -309,7 +309,7 @@ namespace drawinglayer
// isotrophically scaled text in range
pNew = new SdrAutoFitTextPrimitive2D(&rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
}
- else if( rText.isToBeChained() && !rText.isInEditMode() ) // FIXME(matteocam)
+ else if( rText.isToBeChained() /*&& !rText.isInEditMode()*/ ) // FIXME(matteocam)
{
pNew = new SdrChainedTextPrimitive2D(
&rText.getSdrText(),
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 6b7b630..d9ee69f 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1540,7 +1540,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
//impMoveChainedTextToNextLink(pNextTextObj); // just do it
// put overflowing text in next text box
- if (mpOverflowingText != NULL) {
+ if (IsToBeChained()) {
SdrTextObj *pNextTextObj = GetNextLinkInChain();
assert (pNextTextObj);
// NOTE: Commented because we do not need to do this anymore (maybe and for now)
@@ -1548,9 +1548,9 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
// XXX:
//const_cast<SdrTextObj*>(this)->impLeaveOnlyNonOverflowingText();
- // Chaining occurred. Let's reset the status
+ // Let's reset the status now to prevent infinite loops
const_cast<SdrTextObj*>(this)->SetToBeChained( false );
-
+ impLeaveOnlyNonOverflowingText();
//SdrOutliner rOutl = pNextTextObj->ImpGetDrawOutliner();
//pNextTextObj->BegTextEdit( rOutl );
More information about the Libreoffice-commits
mailing list