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

[matteocam]

 svx/source/svdraw/svdotxed.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 82cdf6e57e2d37501828c25cf7a8dfe660c1fa57
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 15:41:16 2014 +0200

    No more explicit unsetting of EE_CNTRL_AUTOPAGESIZE
    
    Change-Id: I5a2a1e0cbba7bda10192eab5505cae26e30f2b8a

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 04670ce..8569775 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -63,9 +63,9 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     }
 
     // FIXME(matteocam)
-    sal_uIntPtr nStat1=rOutl.GetControlWord();
+    /*sal_uIntPtr nStat1=rOutl.GetControlWord();
     nStat1 &=~EE_CNTRL_AUTOPAGESIZE;
-    rOutl.SetControlWord(nStat1);
+    rOutl.SetControlWord(nStat1);*/
 
     OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
     if(pOutlinerParaObject!=NULL)
@@ -139,7 +139,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
     }
     Size aAnkSiz(aViewInit.GetSize());
     aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1
-    Size aMaxSiz(100001000000,1000000);
+    Size aMaxSiz(1000000,1000000);
     if (pModel!=NULL) {
         Size aTmpSiz(pModel->GetMaxObjSize());
         if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();