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

[matteocam]

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

New commits:
commit 73ea279ee0a28b3a785569998919e03a0bc2a117
Author: matteocam <matteo.campane...@gmail.com>
Date:   Fri Jun 19 10:42:16 2015 -0400

    Taking first part of text for underflow from editing outliner
    
    Change-Id: I07d29b9e94103aeeb36d6d8b6c5c8fd53f943a4e

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b6b390e..26ffb78 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2002,8 +2002,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) {
-
-        OutlinerParaObject *pCurText = GetOutlinerParaObject();
+        OutlinerParaObject *pCurText;
+        if (pEdtOutl) {
+            pCurText = pEdtOutl->CreateParaObject();
+        } else {
+            pCurText = GetOutlinerParaObject();
+        }
         // NewTextForCurBox = Txt(CurBox) ++ Txt(NextBox)
         aDrawOutliner.SetText(*pCurText);
         aDrawOutliner.AddText(*pNextLinkWholeText);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits