[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 89f2fa2febecbb1a1ed2667b18eb3bc1b148c895
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 14 15:45:19 2014 +0200

    No clearing of status after handling chainging
    
    Change-Id: I421fcf3d015026c3e06a99c4a726bbc2f2111296

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index b0bf25e..b0db341 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -517,7 +517,7 @@ void ImpEditEngine::CallStatusHdlChaining()
         // The Status has to be reset before the Call,
         // since other Flags might be set in the handler...
         EditStatus aTmpStatus( aStatus );
-        aStatus.Clear(); // No need for this with chaining. It does not affect it either way.
+        //aStatus.Clear(); // No need for this with chaining. It does not affect it either way.
         aStatusHdlLinkChaining.Call( &aTmpStatus );
         aStatusTimer.Stop();    // If called by hand ...
     }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index be2d8fd..dd16447 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1936,7 +1936,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
     const bool bGrowX=(nStat & EE_STAT_TEXTWIDTHCHANGED) !=0;
     const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0;
     const bool bOverflow = (nStat & 0x00000100) != 0;
-    if(bTextFrame && (bGrowX || bGrowY))
+    if(bTextFrame && (bGrowX || bGrowY || !nStat))
     {
         if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight()))
         {