[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Noel Grandin]

 sw/source/core/layout/trvlfrm.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ba6d941c89c13130fd8d5ab1d87123f53b5b18f2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Jun 11 08:47:47 2018 +0200

    tdf#102907 selection indicator missing on vertical text
    
    regression from
    
        commit 79800559268c636740fec69018b1f99f047c3f93
        convert MT_ constants to scoped enum
    
    The original code used bit-wise operations and some clever constant
    values, which I did not convert correctly
    
    Change-Id: I2fcd9e2584638d4a690773ef3f178415153b8b19
    Reviewed-on: https://gerrit.libreoffice.org/55596
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 16b1d80070142e2ffecaba64b62dbe836daafb4f)
    Reviewed-on: https://gerrit.libreoffice.org/55598

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 1586d7e5753d..6fb9da3731e5 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2245,7 +2245,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 )
@@ -2340,7 +2340,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 ||