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

[matteocam]

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

New commits:
commit ff877f13e0d4400ae87edb15d8264194c8fdd6d2
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed Jun 17 16:33:03 2015 -0400

    Drafted onUnderflowStatusEvent
    
    Change-Id: Ib549faad03c4469fd4843db10c02d7425a6db673

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 867423b..f9212b5 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1985,6 +1985,28 @@ void SdrTextObj::onOverflowStatusEvent( )
 
 void SdrTextObj::onUnderflowStatusEvent( )
 {
+    // Underflow:
+    /*
+     *
+     * If there is no overflow and other guy has text then:
+     * 1) get the text of the other guy and add it to the last paragraph
+     * (if the paragraphs are to be merged, no otherwise).
+     * 2) Set the text of the other guy to what is left
+     *
+    */
+
+    SdrTextObj *pNextLink = GetNextLinkInChain();
+    SdrOutliner &rOutl = ImpGetDrawOutliner();
+
+    if (!pNextLink->HasText())
+        return;
+
+    //  1) get the text of the other guy and add it to the last paragraph
+    // XXX: For now it's not merging anything just adding the while thing as a separate para
+    OutlinerParaObject *pNextLinkWholeText = pNextLink->GetOutlinerParaObject();
+    if (pNextLinkWholeText) {
+
+    }
 
 }
 
@@ -2099,15 +2121,6 @@ IMPL_LINK_NOARG(SdrTextObj,ImpDecomposeChainedText)
     if ( bIsPageOverflow ) {
         onOverflowStatusEvent();
     } else {
-        // Underflow:
-        /*
-         *
-         * If there is no overflow and other guy has text then:
-         * 1) get the text of the other guy and add it to the last paragraph
-         * (if the paragraphs are to be merged, no otherwise).
-         * 2) Set the text of the other guy to what is left
-         *
-        */
         onUnderflowStatusEvent();
     }
     return 0;