Kaydet (Commit) 4efe5916 authored tarafından matteocam's avatar matteocam Kaydeden (comit) Thorsten Behrens

chained editeng: Change size settings if box is chainable

Change-Id: I3717324b3be36b9503cae195fd42249d92d2c685
üst 3efdb083
......@@ -755,14 +755,19 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
if (eAniDirection==SDRTEXTANI_UP || eAniDirection==SDRTEXTANI_DOWN) nHgt=1000000;
}
// #i119885# Do not limit/force height to geometrical frame (vice versa for vertical writing)
if(IsVerticalWriting())
{
nWdt = 1000000;
}
else
{
nHgt = 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())
{
nWdt = 1000000;
}
else
{
nHgt = 1000000;
}
}
rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment