[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   10 ++++++++--
 svx/source/svdraw/svdotxed.cxx              |    4 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 73b8f3ecc83833ea782e149d2da8bb345e28b29f
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed May 27 17:28:19 2015 -0400

    Experiment: put back updateMode as true but fixed pointer problem
    
    Change-Id: I53f3f8974ace58da276c16cd456328e64dbe80af

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 26a533b..c9149e1 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -750,9 +750,15 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
             aNextRect.Bottom()-aNextRect.Top()
             )
      );
-    //rOutliner.SetUpdateMode(true);
+    rOutliner.SetUpdateMode(true);
     rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
-    rOutliner.SetText(*mpOverflowingText);  // XXX: copies overflown text
+
+    // XXX: experimental code 27/5/15
+    OutlinerParaObject *someText = rOutliner.CreateParaObject();
+
+    rOutliner.SetText(*someText);  // XXX: copies overflown text
+
+    // clean up code and such
     Size aNewSize(rOutliner.CalcTextSize());
     // create OutlinerParaObject for pNextTextObj
     OutlinerParaObject* pNewParaObject=rOutliner.CreateParaObject();
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 840fbe3..1471711 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -265,7 +265,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
 void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 {
     OutlinerParaObject* pNewText = NULL;
-    OutlinerParaObject* pNextText = NULL;
 
     if(rOutl.IsModified())
     {
@@ -279,8 +278,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
             // set non overflow part of text to current box
             pNewText = rOutl.GetNonOverflowingParaObject(); // empty text obj. if 1st para is overflowing
             // set overflowing text for SdrChainedTextPrimitive2D
-            pNextText = rOutl.GetOverflowingParaObject();
-            mpOverflowingText = pNextText;
+            mpOverflowingText = rOutl.GetOverflowingParaObject();
             // TODO: factor the lines of code above in a single function
 
         }