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

[matteocam]

 editeng/source/editeng/impedit3.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8be7a99d214f204063dd1219b058ad0f2417282f
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jun 27 23:16:02 2014 +0200

    Removing checks on nDiff and CheckAutoPageSize()
    
    Change-Id: I351800be530354c046177fcc7e30f05b146d0893

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ee2f157..2494838 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -436,7 +436,9 @@ void ImpEditEngine::FormatDoc()
     {
         sal_uInt32 nNewHeightNTP;
         sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP );
-        long nDiff = nNewHeight - nCurTextHeight;
+        // FIXME(matteocam)
+        long nDiff = 0;
+        //long nDiff = nNewHeight - nCurTextHeight;
         if ( nDiff )
             aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
         if ( nNewHeight < nCurTextHeight )
@@ -454,7 +456,9 @@ void ImpEditEngine::FormatDoc()
         nCurTextHeight = nNewHeight;
         nCurTextHeightNTP = nNewHeightNTP;
 
-        if ( aStatus.AutoPageSize() )
+        // FIXME(matteocam)
+        //if ( aStatus.AutoPageSize() )
+        if (false)
             CheckAutoPageSize();
         else if ( nDiff )
         {