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

[matteocam]

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

New commits:
commit f839ca859194d0850e33685d7f59d9c75b5e003a
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jun 30 09:29:34 2014 -0400

    Resumed nDiff and CheckAutoPageSize: they were not effective
    
    Change-Id: I599e7b21dc61a09f9cc3f68533183552caaac0ae

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 94a1b67..e220750 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -436,9 +436,8 @@ void ImpEditEngine::FormatDoc()
     {
         sal_uInt32 nNewHeightNTP;
         sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP );
-        // FIXME(matteocam)
-        long nDiff = 0;
-        //long nDiff = nNewHeight - nCurTextHeight;
+
+        long nDiff = nNewHeight - nCurTextHeight;
         if ( nDiff )
             aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
         if ( nNewHeight < nCurTextHeight )
@@ -518,11 +517,6 @@ bool ImpEditEngine::ImpCheckRefMapMode()
 
 void ImpEditEngine::CheckAutoPageSize()
 {
-    // FIXME(matteocam)
-    SetValidPaperSize( aPaperSize );    // consider Min, Max
-    return;
-    // END FIXME
-
     Size aPrevPaperSize( GetPaperSize() );
 
     if ( GetStatus().AutoPageWidth() )
@@ -3430,12 +3424,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                                              ' ' == aText[nTextStart + nTextLen - 1] )
                                             --nTextLen;
 
-                                        // FIXME(matteocam)
-                                        if (aTmpFont.GetItalic() != ITALIC_NONE) {
-                                            Color aColor = COL_BROWN;
-                                            aTmpFont.SetFillColor(aColor);
-                                        }
-
                                         // output directly
                                         aTmpFont.QuickDrawText( pOutDev, aRealOutPos, aText, nTextStart, nTextLen, pDXArray );