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

[matteocam]

 svx/source/svdraw/svdotext.cxx              |    3 +--
 svx/source/svdraw/svdotextdecomposition.cxx |    4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b5ae0b74bcf34618d50aa64e0bcbab7541efdb67
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu May 28 13:27:10 2015 -0400

    Can copy text in real time from the first box (only first overfl.para)
    
    Change-Id: Iccfa5e55f2b0befc9923097917011f3d8fe68322

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a9f5857..e197a24 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1962,8 +1962,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
             // Trying to copy stuff right away
 
             if (pEditStatus->IsPageOverflow()) {
-                SdrOutliner& rOutliner = ImpGetDrawOutliner();
-                mpOverflowingText = rOutliner.GetOverflowingParaObject();
+                mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
                 SdrTextObj *pNextTextObj = GetNextLinkInChain();
                 impCopyTextInTextObj(pNextTextObj);
             }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 7ff01f8..094cc8b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -750,7 +750,9 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
     //OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only first para
     //pNextTextObj->SetOutlinerParaObject(*someText);
     //pNextTextObj->SetText("Bukowski, were are thou?");
-    pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
+    if (mpOverflowingText) {
+        pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
+    }
     //rOutliner.Insert("Bukowski, were are thou?");
     //rOutliner.Clear();
     //rOutliner.SetStatusEventHdl1(Link());