svx/source/svdraw/svdotxed.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit e3d0a465dbe9c1de20c81e8b6c33283fba4c5e57 Author: matteocam <matteo.campane...@gmail.com> Date: Tue Aug 12 15:28:52 2014 +0200 Experiment: other changes Change-Id: I75e6f7f67743430b74afcfff4f9dd3fea33daa22 diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 36e3d7e..04670ce 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -63,8 +63,9 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) } // FIXME(matteocam) - nStat&=~EE_CNTRL_AUTOPAGESIZE; - rOutl.SetControlWord(nStat); + sal_uIntPtr nStat1=rOutl.GetControlWord(); + nStat1 &=~EE_CNTRL_AUTOPAGESIZE; + rOutl.SetControlWord(nStat1); OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); if(pOutlinerParaObject!=NULL) @@ -138,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(1000000,1000000); + Size aMaxSiz(100001000000,1000000); if (pModel!=NULL) { Size aTmpSiz(pModel->GetMaxObjSize()); if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width(); @@ -193,7 +194,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p else { nMaxHgt = 1000000; - nMaxHgt = 2000; } aPaperMax.Width()=nMaxWdt; @@ -249,6 +249,9 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p aPaperMin.Height() = 0; } + // FIXME(matteocam) + aPaperMax.Height() = 2000; + if (pPaperMin!=NULL) *pPaperMin=aPaperMin; if (pPaperMax!=NULL) *pPaperMax=aPaperMax; if (pViewInit!=NULL) *pViewInit=aViewInit; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits