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

[matteocam]

 svx/source/svdraw/svdotext.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 97d5e2f3161cc7ede179dfeda89658d509c009eb
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed Jun 17 16:41:32 2015 -0400

    Causing overflow to transfer text in underflowing src box
    
    Change-Id: I6fa247a4d0388aedbb9aff0bd7afd502b90c9337

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index f9212b5..3713040 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1996,7 +1996,7 @@ void SdrTextObj::onUnderflowStatusEvent( )
     */
 
     SdrTextObj *pNextLink = GetNextLinkInChain();
-    SdrOutliner &rOutl = ImpGetDrawOutliner();
+    SdrOutliner &aDrawOutliner = ImpGetDrawOutliner();
 
     if (!pNextLink->HasText())
         return;
@@ -2005,7 +2005,12 @@ void SdrTextObj::onUnderflowStatusEvent( )
     // XXX: For now it's not merging anything just adding the while thing as a separate para
     OutlinerParaObject *pNextLinkWholeText = pNextLink->GetOutlinerParaObject();
     if (pNextLinkWholeText) {
-
+        // Set text from this object
+        OutlinerParaObject *pCurText = GetOutlinerParaObject();
+        aDrawOutliner.SetText(*pCurText);
+        aDrawOutliner.AddText(*pNextLinkWholeText);
+        OutlinerParaObject *pNewText = aDrawOutliner.CreateParaObject();
+        const_cast<SdrTextObj*>(this)->NbcSetOutlinerParaObject(pNewText);
     }
 
 }