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

[matteocam]

 editeng/source/editeng/impedit3.cxx |    2 +-
 svx/source/svdraw/svdotext.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8aebd168df66261279b178444853b8ffcb845372
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 14 15:12:39 2014 +0200

    TextObj's chaining changed only if  called for it in onEditOutlinerStatusEvent
    
    Change-Id: I8736b039f3a4be519e68e3e60f87e7c32a8b2153

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 8f95bce..6393b29 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -512,7 +512,7 @@ void ImpEditEngine::FormatDoc()
 
 void ImpEditEngine::CallStatusHdlChaining()
 {
-    if ( aStatusHdlLinkChaining.IsSet() && aStatus.GetStatusWord() )
+    if ( aStatusHdlLinkChaining.IsSet() /* && aStatus.GetStatusWord() */)
     {
         // The Status has to be reset before the Call,
         // since other Flags might be set in the handler...
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index fe9dcd6..0e32745 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1953,7 +1953,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
             ImpAutoFitText(*pEdtOutl);
             mbInDownScale = false;
         }
-        else if ( GetNextLinkInChain() != NULL)
+        else if ( GetNextLinkInChain() != NULL && pEditStatus->IsPageOverflow() && !nStat ) // do it only if it is a call explicitly for chaining (status word already cleared)
         {
             // set the need for chaining
             SetToBeChained( pEditStatus->IsPageOverflow() );