summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/layout/trvlfrm.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index fee388a696c1..22273e0173e6 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2271,7 +2271,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
Sub( aRegion, aTmp );
// The next statement means neither ruby nor rotate(90):
- if( MultiPortionType::RUBY != pEnd2Pos->nMultiType )
+ if( MultiPortionType::RUBY != pEnd2Pos->nMultiType && MultiPortionType::ROT_90 != pEnd2Pos->nMultiType )
{
SwTwips nTmp = fnRectX.GetTop(pEnd2Pos->aLine);
if( fnRectX.GetTop(aEndRect) != nTmp )
@@ -2366,7 +2366,9 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
if( pStartFrame == pEndFrame )
{
bool bSameRotatedOrBidi = pSt2Pos && pEnd2Pos &&
- ( MultiPortionType::BIDI == pSt2Pos->nMultiType ) &&
+ ( MultiPortionType::BIDI == pSt2Pos->nMultiType ||
+ MultiPortionType::ROT_270 == pSt2Pos->nMultiType ||
+ MultiPortionType::ROT_90 == pSt2Pos->nMultiType ) &&
pSt2Pos->aPortion == pEnd2Pos->aPortion;
//case 1: (Same frame and same row)
if( bSameRotatedOrBidi ||