Fix: Selektion and rotated parts of line

sw/source/core/layout/trvlfrm.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: trvlfrm.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ama $ $Date: 2000-12-12 10:49:12 $
+ *  last change: $Author: ama $ $Date: 2001-01-29 12:33:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1912,11 +1912,13 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
             {
                 SwRect aTmp( aStRect.Pos(),
                     Point( pSt2Pos->aPortion.Right(), aStRect.Bottom() ) );
-                if( pSt2Pos->aPortion.Top() == aStRect.Top() )
+                if( !pSt2Pos->nMultiType ||
+                    pSt2Pos->aPortion.Top() == aTmp.Top() )
                     aTmp.Top( pSt2Pos->aLine.Top() );
                 aTmp.Intersection( aStFrm );
                 Sub( aRegion, aTmp );
-                if( aStRect.Bottom() < pSt2Pos->aLine.Bottom() )
+                if( pSt2Pos->nMultiType &&
+                    aStRect.Bottom() < pSt2Pos->aLine.Bottom() )
                 {
                     aTmp.Top( aTmp.Bottom() );
                     aTmp.Bottom( pSt2Pos->aLine.Bottom() );
@@ -1933,11 +1935,13 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                 SwRect aTmp( Point( pEnd2Pos->aPortion.Left(), aEndRect.Top() ),
                     Point( aEndRect.Left() + aEndRect.Width(),
                            aEndRect.Top() + aEndRect.Height() ) );
-                if( pEnd2Pos->aPortion.Bottom() == aEndRect.Bottom() )
+                if( !pEnd2Pos->nMultiType ||
+                    pEnd2Pos->aPortion.Bottom() == aEndRect.Bottom() )
                     aTmp.Bottom( pEnd2Pos->aLine.Bottom() );
                 aTmp.Intersection( aEndFrm );
                 Sub( aRegion, aTmp );
-                if( aEndRect.Top() > pEnd2Pos->aLine.Top() )
+                if( pEnd2Pos->nMultiType &&
+                    aEndRect.Top() > pEnd2Pos->aLine.Top() )
                 {
                     aTmp.Bottom( aTmp.Top() );
                     aTmp.Top( pEnd2Pos->aLine.Top() );
@@ -1972,11 +1976,24 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
         else if( nTmp > aEndFrm.Right() )
             aEndRect.Right( aEndFrm.Right() );
 
+        if( pStartFrm == pEndFrm )
+        {
+            sal_Bool bSameRotatedLine =
+                pSt2Pos && pEnd2Pos && 2 != pSt2Pos->nMultiType &&
+                pSt2Pos->aPortion == pEnd2Pos->aPortion;
             //Fall 1: (Gleicher Frame und gleiche Zeile)
-        if( pStartFrm == pEndFrm && aStRect.Top() == aEndRect.Top() )
+            if( aStRect.Top() == aEndRect.Top() || bSameRotatedLine )
             {
-            SwRect aTmp( aStRect.Pos(),
-                            Point( aEndRect.Left(), aEndRect.Bottom() ));
+                Point aTmpSt( aStRect.Pos() );
+                Point aTmpEnd( aEndRect.Right(), aEndRect.Bottom() );
+                if( bSameRotatedLine && aTmpSt.Y() > aTmpEnd.Y() )
+                {
+                    long nTmpY = aTmpEnd.Y();
+                    aTmpEnd.Y() = aTmpSt.Y();
+                    aTmpSt.Y() = nTmpY;
+                }
+
+                SwRect aTmp = SwRect( aTmpSt, aTmpEnd );
                 // Bug 34888: falls Inhalt selektiert ist, der keinen Platz
                 //            einnimmt (z.B. PostIts,RefMarks, TOXMarks),
                 //            dann mindestens die Breite des Crsr setzen.
@@ -1992,7 +2009,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                 Sub( aRegion, aTmp );
             }
             //Fall 2: (Gleicher Frame ueber mehr als eine Zeile)
-        else if( pStartFrm == pEndFrm )
+            else
             {
                 SwTwips lLeft, lRight;
                 if( pSt2Pos && pEnd2Pos && pSt2Pos->aPortion == pEnd2Pos->aPortion )
@@ -2023,6 +2040,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                 Sub( aRegion, SwRect( Point( lLeft, aEndRect.Top() ),
                                    Point( aEndRect.Left(), aEndRect.Bottom() )));
             }
+        }
         //Fall 3: (Unterschiedliche Frm's, moeglicherweise auch welche
         //         dazwischen)
         else

sw/source/core/text/itrcrsr.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itrcrsr.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: ama $ $Date: 2001-01-19 15:23:12 $
+ *  last change: $Author: ama $ $Date: 2001-01-29 12:34:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -441,7 +441,8 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                 nPorHeight = pPor->Height();
                 nPorAscent = pPor->GetAscent();
             }
-            while( pPor && aInf.GetIdx() < nOfst && !pPor->IsBreakPortion() )
+            while( pPor && !pPor->IsBreakPortion() && ( aInf.GetIdx() < nOfst ||
+                   ( bWidth && pPor->IsMultiPortion() ) ) )
             {
                 if( !pPor->IsMarginPortion() && !pPor->IsPostItsPortion() &&
                     (!pPor->InFldGrp() || pPor->GetAscent() ) )
@@ -487,11 +488,21 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                     if( pPor->IsMultiPortion() )
                     {
                         nY += nTmpAscent - nPorAscent;
-                        if( ((SwMultiPortion*)pPor)->IsDouble() &&
-                            pCMS && pCMS->b2Lines )
+                        if( ( ((SwMultiPortion*)pPor)->IsDouble() ||
+                              ((SwMultiPortion*)pPor)->HasRotation() )
+                             && pCMS && pCMS->b2Lines )
                         {
                             pCMS->p2Lines = new Sw2LinesPos();
                             pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize);
+                            if( ((SwMultiPortion*)pPor)->HasRotation() )
+                            {
+                                if( ((SwMultiPortion*)pPor)->IsRevers() )
+                                    pCMS->p2Lines->nMultiType = 1;
+                                else
+                                    pCMS->p2Lines->nMultiType = 0;
+                            }
+                            else
+                                pCMS->p2Lines->nMultiType = 2;
                             SwTwips nTmpWidth = pPor->Width();
                             if( nSpaceAdd )
                                 nTmpWidth += pPor->CalcSpacing(nSpaceAdd, aInf);