[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/svdoutl.cxx       |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2b0286e8a4d07f1972de12e73615d1f8f16c8d91
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Sep 4 00:10:32 2014 +0200

    De-embedded other height. Embedded height in ImpInitDrawOutliner
    
    Change-Id: I8943c2ca5da14a251b530b36a69d74448e4e0c5b

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index a4a323a..db962b5 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -614,7 +614,6 @@ void ImpEditEngine::CheckPageOverflow()
     // setting overflow status
 
     sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
-    fprintf(stderr, "[OVERFLOW-CHECK] Current MaxAutoPaperSize is %d\n", nBoxHeight);
 
     if (CalcTextHeight(NULL) > nBoxHeight)
     {
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index ebfa40d..e287961 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1237,7 +1237,7 @@ void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
     nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
     rOutl.SetControlWord(nStat);
     Size aNullSize;
-    Size aMaxSize(100000,100000);
+    Size aMaxSize(100000,2418);
     rOutl.SetMinAutoPaperSize(aNullSize);
     rOutl.SetMaxAutoPaperSize(aMaxSize);
     rOutl.SetPaperSize(aMaxSize);
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index a1b609b..3b14316 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -56,7 +56,7 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
         SetControlWord(nStat);
 
         Size aNullSize;
-        Size aMaxSize( 100000,2418 ); // FIXME(matteocam)
+        Size aMaxSize( 100000, 100000 );
         SetMinAutoPaperSize( aNullSize );
         SetMaxAutoPaperSize( aMaxSize );
         SetPaperSize( aMaxSize );