svx/source/svdraw/svdotext.cxx | 7 +++++-- svx/source/svdraw/svdotextdecomposition.cxx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 160d35600f9ede4bd354db4f4f0203f2f396f86a Author: matteocam <matteo.campane...@gmail.com> Date: Wed May 27 18:38:36 2015 -0400 Insert fixed string when chaining occurs Change-Id: I0a16523810d2aea20e4abc181494e5bac8b7c091 diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index b9190ce..7cdc878 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1960,8 +1960,11 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) fprintf(stderr, "[CHAINING] Need for Chaining is %s\n", pEditStatus->IsPageOverflow() ? "TRUE" : "FALSE"); // Trying to copy stuff right away - SdrTextObj *pNextTextObj = GetNextLinkInChain(); - impCopyTextInTextObj(pNextTextObj); + + if (pEditStatus->IsPageOverflow()) { + SdrTextObj *pNextTextObj = GetNextLinkInChain(); + impCopyTextInTextObj(pNextTextObj); + } } } diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 06f1c27..de34777 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -742,7 +742,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const // trying to copy text in obj 1 //SdrText* pText = getActiveText(); - SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner(); + //SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner(); //rOutliner.SetUpdateMode(true); //rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText)); // XXX: experimental code 27/5/15 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits