[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      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 651a5edee2991a4ed6fa7227fb7ddb8f7168d66b
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 14 15:20:36 2014 +0200

    Removed status words'checks for overflow
    
    Change-Id: I10a5032be60a83dd6ca7b4429a967f9a9b80edcb

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 6393b29..b0bf25e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -518,7 +518,7 @@ void ImpEditEngine::CallStatusHdlChaining()
         // 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.
-        //aStatusHdlLinkChaining.Call( &aTmpStatus );
+        aStatusHdlLinkChaining.Call( &aTmpStatus );
         aStatusTimer.Stop();    // If called by hand ...
     }
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0e32745..be2d8fd 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 || bOverflow))
+    if(bTextFrame && (bGrowX || bGrowY))
     {
         if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight()))
         {
@@ -1953,7 +1953,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
             ImpAutoFitText(*pEdtOutl);
             mbInDownScale = false;
         }
-        else if ( GetNextLinkInChain() != NULL && pEditStatus->IsPageOverflow() && !nStat ) // do it only if it is a call explicitly for chaining (status word already cleared)
+        else if ( GetNextLinkInChain() != NULL && !nStat ) // do it only if it is a call explicitly for chaining (status word already cleared)
         {
             // set the need for chaining
             SetToBeChained( pEditStatus->IsPageOverflow() );