diff options
author | matteocam <matteo.campanelli@gmail.com> | 2015-09-07 12:32:14 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-20 13:05:15 +0200 |
commit | 4efe591659f63ea50b751ece8e7294776c7fbff1 (patch) | |
tree | ce3df77168b8250580e5fc1647dfac757dc562df /svx/source/svdraw/svdotxed.cxx | |
parent | 3efdb083bf50829fb8398eb9efa42664910341f3 (diff) |
chained editeng: Change size settings if box is chainable
Change-Id: I3717324b3be36b9503cae195fd42249d92d2c685
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
-rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index b0b2ccce3e64..c68b085bb43e 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -62,6 +62,14 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetControlWord(nStat); } + // disable AUTOPAGESIZE if IsChainable (might be required for overflow check) + if ( IsChainable() ) { + EEControlBits nStat1=rOutl.GetControlWord(); + nStat1 &=~EEControlBits::AUTOPAGESIZE; + rOutl.SetControlWord(nStat1); + } + + OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); if(pOutlinerParaObject!=NULL) { @@ -181,14 +189,18 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p if (eAniDirection==SDRTEXTANI_UP || eAniDirection==SDRTEXTANI_DOWN) nMaxHgt=1000000; } - // #i119885# Do not limit/force height to geometrical frame (vice versa for vertical writing) - if(IsVerticalWriting()) - { - nMaxWdt = 1000000; - } - else - { - nMaxHgt = 1000000; + bool bChainedFrame = IsChainable(); + // Might be required for overflow check working: do limit height to frame if box is chainable. + if (!bChainedFrame) { + // #i119885# Do not limit/force height to geometrical frame (vice versa for vertical writing) + if(IsVerticalWriting()) + { + nMaxWdt = 1000000; + } + else + { + nMaxHgt = 1000000; + } } aPaperMax.Width()=nMaxWdt; |