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

[matteocam]

 svx/source/svdraw/svdotext.cxx              |    2 ++
 svx/source/svdraw/svdotextdecomposition.cxx |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 573fd33418bb0d2caf1a83ad14c65150fa76ccc5
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed May 27 18:54:45 2015 -0400

    (Not working) Trying to set overflowing para in next box
    
    Change-Id: I2901f6e8f4efe33e7c80c3de3e9e4f73ceefbf31

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7cdc878..a9f5857 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1962,6 +1962,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
             // Trying to copy stuff right away
 
             if (pEditStatus->IsPageOverflow()) {
+                SdrOutliner& rOutliner = ImpGetDrawOutliner();
+                mpOverflowingText = rOutliner.GetOverflowingParaObject();
                 SdrTextObj *pNextTextObj = GetNextLinkInChain();
                 impCopyTextInTextObj(pNextTextObj);
             }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index de34777..7ff01f8 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -48,6 +48,7 @@
 #include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
@@ -748,7 +749,8 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
     // XXX: experimental code 27/5/15
     //OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only first para
     //pNextTextObj->SetOutlinerParaObject(*someText);
-    pNextTextObj->SetText("Bukowski, were are thou?");
+    //pNextTextObj->SetText("Bukowski, were are thou?");
+    pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
     //rOutliner.Insert("Bukowski, were are thou?");
     //rOutliner.Clear();
     //rOutliner.SetStatusEventHdl1(Link());