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

[matteocam]

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

New commits:
commit 65369247ade3795e292a05ebfc184bdd03fe0035
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed Jun 17 14:22:03 2015 -0400

    No more empty line at the beginning of dest box after overflow
    
    Change-Id: I40e75163868244c0fef06834cf6b5d7ec8d8d023

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index cd3e2c7..009bb4a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -845,8 +845,11 @@ OutlinerParaObject *SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
 
     // Append old first para in the destination box to
     //   last part of overflowing text
-    if (pJoiningPara)
+    if (pJoiningPara && mpOverflowingText->HasOtherParas())
         pOutliner->AddText(*pJoiningPara);
+    // this second case is if there is to avoid getting an empty line before pJoiningPara
+    else if (pJoiningPara && !mpOverflowingText->HasOtherParas())
+        pOutliner->SetText(*pJoiningPara);
 
     // Append all other old paras
     if (pOldParasTail)