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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |    3 ++-
 svx/source/svdraw/svdotxed.cxx              |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 655a706988e4870dc577ea84373f536b8bab8b3f
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 15:01:49 2014 +0200

    Experiment: ensuring that EE_CNTRL_AUTOPAGESIZE is not set
    
    Change-Id: I86da72907044ea32b886fa6baa4d8171401c3990

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 4f62e0b..36e3d7e 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -62,6 +62,10 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
         rOutl.SetControlWord(nStat);
     }
 
+    // FIXME(matteocam)
+    nStat&=~EE_CNTRL_AUTOPAGESIZE;
+    rOutl.SetControlWord(nStat);
+
     OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
     if(pOutlinerParaObject!=NULL)
     {
commit 21bea773ca7778588543fb7cb4733a35e7257d1e
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 14:58:30 2014 +0200

    Experiment: chained text boundaries in impDecomposeBlockTextPrimitive
    
    Change-Id: Ia022f8ac3fa50a2c2c24fbb0193c213411452300

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 4ed8b58..882136b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -935,7 +935,8 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
     rOutliner.SetFixedCellHeight(rSdrBlockTextPrimitive.isFixedCellHeight());
     rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE);
     rOutliner.SetMinAutoPaperSize(aNullSize);
-    rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
+    //rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
+    rOutliner.SetMaxAutoPaperSize(Size(1000000,2000));
 
     // Resolves: fdo#35779 set background color of this shape as the editeng background if there
     // is one. Check the shape itself, then the host page, then that page's master page.