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

[matteocam]

 editeng/source/editeng/impedit3.cxx |    1 +
 svx/source/svdraw/svdotext.cxx      |    2 ++
 svx/source/svdraw/svdotxed.cxx      |    1 +
 3 files changed, 4 insertions(+)

New commits:
commit 585a092eddcc9c4ac3f39abd798c69bc2f34a0d2
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 14:45:22 2014 +0200

    Experiment: setting fixed Max height from SdrTextObj
    
    Change-Id: I734400203befe89803a07ad73b8b9a83b61e58f3

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 9944878..a9b7483 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -546,6 +546,7 @@ void ImpEditEngine::CheckAutoPageSize()
     // FIXME(matteocam)
     /* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
                         ? "YES Overflow!\n"  : "NO Overflow!\n" ); */
+    fprintf( stderr, "aPaperSize.Height = %d\n", aPaperSize.Height() );
     // setting overflow status
     if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
         // which paragraph is the first to cause higher size of the box?
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index cbdec1e..aefaca8 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -750,6 +750,8 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
             else
             {
                 nHgt = 1000000;
+                // FIXME(matteocam)
+                nHgt = 2000;
             }
 
             rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 9151fe4..4f62e0b 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -189,6 +189,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
             else
             {
                 nMaxHgt = 1000000;
+                nMaxHgt = 2000;
             }
 
             aPaperMax.Width()=nMaxWdt;