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

[matteocam]

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

New commits:
commit 185abcf6f56e7eb2e31f656474269f0aac96cf3a
Author: matteocam <matteo.campane...@gmail.com>
Date:   Thu May 28 17:50:41 2015 -0400

    Minor refactoring
    
    Change-Id: Ie627b0e6274581a5946ee18103f8720fd29b8bc8

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index e6b4156..1695183 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1964,6 +1964,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 
             // Pushes text in next link on the fly
             if ( pEditStatus->IsPageOverflow() ) {
+                mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
                 SdrTextObj *pNextTextObj = GetNextLinkInChain();
                 impCopyTextInTextObj(pNextTextObj);
             }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index d0d72dc..ffbca74 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -741,7 +741,6 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
    
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
    // Push text through the chain if there's any
-   mpOverflowingText = pEdtOutl->GetOverflowingParaObject();
     if (mpOverflowingText) {
         pNextTextObj->NbcSetOutlinerParaObject(mpOverflowingText);
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits