#102585# Frames in vertical tables

sw/source/core/layout/frmtool.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmtool.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: od $ $Date: 2002-09-18 10:44:07 $
+ *  last change: $Author: fme $ $Date: 2002-09-19 13:24:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1183,6 +1183,14 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             pPrv = pFrm;
             //Index auf den Endnode der Tabellensection setzen.
             nIndex = pTblNode->EndOfSectionIndex();
+
+            SwTabFrm* pTmpFrm = (SwTabFrm*)pFrm;
+            while ( pTmpFrm )
+            {
+                pTmpFrm->CheckDirChange();
+                pTmpFrm = pTmpFrm->IsFollow() ? pTmpFrm->FindMaster() : NULL;
+            }
+
         }
         else if ( pNd->IsSectionNode() )
         {

sw/source/core/layout/tabfrm.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabfrm.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: fme $ $Date: 2002-09-16 08:47:13 $
+ *  last change: $Author: fme $ $Date: 2002-09-19 13:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2520,10 +2520,21 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm )
                     {
                         const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize();
                         if( !rSz.GetHeightPercent() )
-// to do VERTICAL !
-                            nHeight = Max( nHeight, pFly->Frm().Height() +
-                                pFly->GetCurRelPos().Y() + pTmp->Frm().Top()
-                                - pFrm->Frm().Top() - pFrm->Frm().Height() );
+                        {
+                            const SwTwips nFlyWidth =
+                                (pFly->Frm().*fnRect->fnGetHeight)() +
+                                    ( bVert ?
+                                      pFly->GetCurRelPos().X() :
+                                      pFly->GetCurRelPos().Y() );
+
+                            const SwTwips nFrmDiff =
+                                (*fnRect->fnYDiff)(
+                                    (pTmp->Frm().*fnRect->fnGetTop)(),
+                                    (pFrm->Frm().*fnRect->fnGetTop)() );
+
+                            nHeight = Max( nHeight, nFlyWidth + nFrmDiff -
+                                            (pFrm->Frm().*fnRect->fnGetHeight)() );
+                        }
                     }
                 }
             }