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

[matteocam]

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

New commits:
commit bbb9450d0f57c03e19884dacf0a8e135b38a1662
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jul 10 18:29:32 2015 -0400

    Set explicitly paper size
    
    Change-Id: Idfb03e306199a38522ec35585fda2a0f9687e6dd

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index d144d28..4c48266 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -153,7 +153,6 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
     // Restore size and set new text
     pOutl->SetMaxAutoPaperSize(aOldSize);
     pOutl->SetText(*pNewText);
-    pOutl->SetMaxAutoPaperSize(Size(pOutl->GetMaxAutoPaperSize().Width(), pOutl->GetTextHeight()));
 
     //GetTextChain()->SetNilChainingEvent(mpTargetLink, false);
 
@@ -172,6 +171,7 @@ void TextChainFlow::ExecuteOverflow(SdrOutliner *pNonOverflOutl, SdrOutliner *pO
     {
         impMoveChainedTextToNextLink(pOverflOutl);
     }
+
     //GetTextChain()->SetNilChainingEvent(mpTargetLink, false);
 }
 
@@ -182,6 +182,8 @@ void TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl)
     pNonOverflOutl->SetText(*pNewText);
 
     mpTargetLink->NbcSetOutlinerParaObject(pNewText);
+    pNonOverflOutl->SetPaperSize(Size(pNonOverflOutl->GetPaperSize().Width(),
+                                      pNonOverflOutl->GetTextHeight()));
 
 }