Chg: Vertical layout grow/shrink

12 files changed, 94 insertions, 75 deletions

diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 8d3c8022ae82..111916976a3f 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cntfrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:22:10 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:09:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,9 +95,9 @@ protected:
     BOOL MakePrtArea( const SwBorderAttrs & );
 
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 
     SwCntntFrm( SwCntntNode * const );
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 49ed70acf2e7..a530d41ca101 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: flyfrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:22:10 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:10:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -179,8 +179,8 @@ public:
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
 
-    SwTwips _Shrink( SwTwips, const SzPtr, BOOL bTst );
-    SwTwips _Grow  ( SwTwips, const SzPtr, BOOL bTst );
+    SwTwips _Shrink( SwTwips, SZPTR BOOL bTst );
+    SwTwips _Grow  ( SwTwips, SZPTR BOOL bTst );
     void    _Invalidate( SwPageFrm *pPage = 0 );
 
     BOOL FrmSizeChg( const SwFmtFrmSize & );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 6d1e26cd80af..d66f787673e1 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frame.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: ama $ $Date: 2001-10-05 12:30:53 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:10:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,12 +68,27 @@
 #include "swrect.hxx"
 #include "calbck.hxx"   // fuer SwClient
 
+#ifdef VERTICAL_LAYOUT
+
+#define SZPTR
+#define PHEIGHT
+#define PWIDTH
+#define BFIXHEIGHT bFixSize
+#define PTPTR PointPtr
+#define SIZEPTR SizePtr
+typedef long Size::* SizePtr;
+typedef long Point::* PointPtr;
+
+#else
+
 typedef long Size::* SzPtr;
 extern SzPtr pHeight;
 extern SzPtr pWidth;
 typedef long Point::* PtPtr;
 extern PtPtr pX;
 extern PtPtr pY;
+#define PTPTR PtPtr
+#define SIZEPTR SzPtr
 
 //Liefern Memberpointer auf die jeweiligen Groessen.
 #define pFIXPOS  ( bVarHeight ? pX : pY )
@@ -81,6 +96,12 @@ extern PtPtr pY;
 #define pVARPOS  ( bVarHeight ? pY : pX )
 #define pVARSIZE ( bVarHeight ? pHeight : pWidth )
 
+#define SZPTR const SzPtr,
+#define PHEIGHT ,pHeight
+#define PWIDTH ,pWidth
+#define BFIXHEIGHT bFixHeight
+#endif
+
 class SwLayoutFrm;
 class SwRootFrm;
 class SwPageFrm;
@@ -99,7 +120,6 @@ class ViewShell;
 class Brush;
 class Color;
 class SwBorderAttrs;
-class Sw3FrameIo;
 class SwCache;
 class SvxBrushItem;
 class SwTxtFtn;
@@ -177,11 +197,6 @@ struct SwCrsrMoveState;
 #define FRM_NEIGHBOUR   0x2004
 #define FRM_NOTE_VERT   0x5a60
 
-#define V_WIDTH SSize().*pDir1Sz
-#define V_HEIGHT SSize().*pDir2Sz
-#define V_X Pos().*pDir1Pt
-#define V_Y Pos().*pDir2Pt
-
 class SwFrm;
 typedef long (SwFrm:: *SwFrmGet)() const;
 typedef BOOL (SwFrm:: *SwFrmMax)( long );
@@ -232,6 +247,10 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R;
                             SwRectFn fnRect = bVert ? \
                                 ( bRev ? fnRectVL2R : fnRectVert ): \
                                 ( bRev ? fnRectB2T : fnRectHori );
+#define SWRECTFN2( pFrm )   sal_Bool bVert = pFrm->IsVertical(); \
+                            sal_Bool bNeighb = pFrm->IsNeighbourFrm(); \
+                            SwRectFn fnRect = bVert == bNeighb ? \
+                                fnRectHori : fnRectVert;
 #define POS_DIFF( aFrm1, aFrm2 ) \
             ( (aFrm1.*fnRect->fnGetTop)() != (aFrm2.*fnRect->fnGetTop)() || \
             (aFrm1.*fnRect->fnGetLeft)() != (aFrm2.*fnRect->fnGetLeft)() )
@@ -417,8 +436,13 @@ protected:
     BOOL bValidPrtArea:     1;
     BOOL bValidSize:        1;
     BOOL bValidLineNum:     1;
+#ifdef VERTICAL_LAYOUT
+    BOOL bFixSize:          1;
+    BOOL bUnUsed1:          1;
+#else
     BOOL bFixHeight:        1;
     BOOL bFixWidth:         1;
+#endif
     BOOL bCompletePaint:    1;  //Frame wird ganz gepaintet wenn TRUE, auch
                                 //wenn der Inhalt nur teilw. veraendert ist;
                                 //Bei CntntFrms wird ausschliesslich wenn TRUE
@@ -426,7 +450,11 @@ protected:
     BOOL bRetouche:         1;  //Der Frame ist fuer Retusche verantwortlich
                                 //wenn TRUE.
 public:
+#ifdef VERTICAL_LAYOUT
+    BOOL bUnUsed2:          1;
+#else
     BOOL bVarHeight:        1;  //Variable groesse ist die Hoehe wenn TRUE.
+#endif
 protected:
     BOOL bInfInvalid:       1;  //InfoFlags sind Invalid.
     BOOL bInfBody:          1;  //Frm steht im DokumentBody.
@@ -450,9 +478,9 @@ protected:
 
 
         //Aendern nur die Framesize, nicht die PrtArea-SSize
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0;
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0;
 
     SwModify        *GetDep()       { return pRegisteredIn; }
@@ -460,7 +488,6 @@ protected:
 
     SwFrm( SwModify* );
 
-    SwFrm( Sw3FrameIo&, SwLayoutFrm* );
 public:
     TYPEINFO(); //Bereits in Basisklasse Client drin.
 
@@ -474,15 +501,12 @@ public:
     static SwCache *GetCachePtr()             { return pCache;  }
     static void     SetCache( SwCache *pNew ) { pCache = pNew;  }
 
-    virtual void Store( Sw3FrameIo& ) const;
-
         //Aendern die PrtArea-SSize und die FrmSize.
-    SwTwips Shrink( SwTwips, const SzPtr,
+    SwTwips Shrink( SwTwips, SZPTR
                     BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    SwTwips Grow  ( SwTwips, const SzPtr,
+    SwTwips Grow  ( SwTwips, SZPTR
                     BOOL bTst = FALSE, BOOL bInfo = FALSE );
 
-
     //Wir brauchen unterschiedliche Methoden (wg. Performance) fuer das
     //Einfuegenin den Layout Baum:
 
@@ -587,7 +611,11 @@ public:
           SwAttrSet *GetAttrSet();
     void             GetAttrSet( SwAttrSet* );
 
+#ifdef VERTICAL_LAYOUT
+    inline BOOL HasFixSize() const { return bFixSize; }
+#else
     BOOL HasFixSize( const SzPtr ) const;
+#endif
 
     //Kann 0 liefern, pruefen auch ob die Shell zum richtigen Dokument
     //gehoert. Impl in frmsh.hxx
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 6cf873db5fb3..d68def31c4af 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftnfrm.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-10-15 12:50:20 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:12:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,9 +82,9 @@ public:
     const SwFtnFrm* FindFootNote() const;
     const SwFtnFrm* FindEndNote() const;
 
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm( SwTwips, SZPTR
                              BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual void    Format( const SwBorderAttrs *pAttrs = 0 );
     virtual void    PaintBorder( const SwRect &, const SwPageFrm *pPage,
@@ -107,9 +107,9 @@ class SwFtnFrm: public SwLayoutFrm
                                 //nicht rueckwaerts fliessen.
 #ifndef PRODUCT
 protected:
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 #endif
 
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 7ecefc50006d..f1a0001d60fa 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hffrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:26:44 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:13:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,9 +73,9 @@ class SwHeaderFrm: public SwLayoutFrm
 public:
     SwHeaderFrm( SwFrmFmt* );
 
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrm)
@@ -87,9 +87,9 @@ public:
     SwFooterFrm( SwFrmFmt* );
 
     virtual void Format( const SwBorderAttrs *pAttrs = 0 );
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
     DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm)
 };
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index e09b789d5f28..80afc08bb7fc 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: layfrm.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ama $ $Date: 2001-08-23 13:54:44 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:13:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,6 @@
 
 class SwCntntFrm;
 class SwFlowFrm;
-class Sw3FrameIo;
 class SwFmtCol;
 struct SwCrsrMoveState;
 class SwFrmFmt;
@@ -93,16 +92,13 @@ protected:
 
     SwFrm           *pLower;
 
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 
     long CalcRel( const SwFmtFrmSize &rSz, BOOL bWidth ) const;
 
-    SwLayoutFrm( Sw3FrameIo&, SwLayoutFrm* );
-    void LoadLower( Sw3FrameIo& );
-    void StoreLower( Sw3FrameIo& ) const;
 public:
     void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
     void RefreshLaySubsidiary( const SwPageFrm*, const SwRect& ) const;
@@ -120,8 +116,6 @@ public:
     void PaintColLines( const SwRect &, const SwFmtCol &,
                         const SwPageFrm * ) const;
 
-    virtual void Store( Sw3FrameIo& ) const;
-
     virtual BOOL  GetCrsrOfst( SwPosition *, Point&,
                                 const SwCrsrMoveState* = 0 ) const;
 
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 0b4b344c66af..7f6c4adf3eeb 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pagefrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ama $ $Date: 2001-08-23 13:58:01 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:14:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,6 @@ class SwFlyFrm;
 class SwFrmFmt;
 class SwPageDesc;
 class SwCntntFrm;
-class Sw3FrameIo;
 struct SwPosition;
 struct SwCrsrMoveState;
 class SwFmtAnchor;
@@ -137,7 +136,6 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm)
 
     SwPageFrm( SwFrmFmt*, SwPageDesc* );
-    SwPageFrm( Sw3FrameIo&, SwLayoutFrm* );
     ~SwPageFrm();
 
     //public, damit die ViewShell beim Umschalten vom BrowseMode darauf
@@ -183,8 +181,6 @@ public:
     //fuer SwFEShell und Modify der Flys.
     SwFrm *PlaceFly( SwFlyFrm *, SwFrmFmt *, const SwFmtAnchor * );
 
-    virtual void Store( Sw3FrameIo& ) const;
-
     virtual BOOL GetCrsrOfst( SwPosition *, Point&,
                               const SwCrsrMoveState* = 0 ) const;
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 82fcd7273e2a..8dac711a1355 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rootfrm.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:55:54 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:14:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -216,17 +216,19 @@ public:
     virtual BOOL  GetCrsrOfst( SwPosition *, Point&,
                                const SwCrsrMoveState* = 0 ) const;
     virtual void  Paint( const SwRect& ) const;
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 #ifndef PRODUCT
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
 
-    Point  GetNextPrevCntntPos( const Point &rPoint, BOOL bNext ) const;
+#ifndef VERTICAL_LAYOUT
     void   SetFixSize( SzPtr );
+#endif
+    Point  GetNextPrevCntntPos( const Point &rPoint, BOOL bNext ) const;
     virtual void ChgSize( const Size& aNewSize );
 
     inline void SetIdleFlags();
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index fa44cc369651..56fd1627fd68 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rowfrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:26:44 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:15:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,9 @@ class SwRowFrm: public SwLayoutFrm
 {
     virtual void Format( const SwBorderAttrs *pAttrs = 0 );
         //Aendern nur die Framesize, nicht die PrtArea-SSize
-    virtual SwTwips ShrinkFrm( SwTwips, const SzPtr,
+    virtual SwTwips ShrinkFrm( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 
     const SwTableLine *pTabLine;
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 84ee50c2ccf6..c74ceb3de1d1 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sectfrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:26:44 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:15:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,8 +135,8 @@ public:
     SwSectionFrm *FindFirstSectionMaster();
     SwFtnContFrm* ContainsFtnCont( const SwFtnContFrm* pCont = NULL ) const;
     BOOL Growable() const;
-    SwTwips _Shrink( SwTwips, const SzPtr, BOOL bTst );
-    SwTwips _Grow  ( SwTwips, const SzPtr, BOOL bTst );
+    SwTwips _Shrink( SwTwips, SZPTR BOOL bTst );
+    SwTwips _Grow  ( SwTwips, SZPTR BOOL bTst );
 
     // A sectionfrm has to maximize, if he has a follow or a ftncontainer at
     // the end of the page. A superfluous follow will be ignored,
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index b8763d0eb384..a3fb0de6fa5f 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabfrm.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-10-12 13:26:44 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:16:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,7 +114,7 @@ protected:
     virtual void MakeAll();
     virtual void Format( const SwBorderAttrs *pAttrs = 0 );
         //Aendert nur die Framesize, nicht die PrtArea-SSize
-    virtual SwTwips GrowFrm  ( SwTwips, const SzPtr,
+    virtual SwTwips GrowFrm  ( SwTwips, SZPTR
                                BOOL bTst = FALSE, BOOL bInfo = FALSE );
 public:
     SwTabFrm( SwTable & );  //Immer nach dem erzeugen _und_ pasten das
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 1207efafefed..dd8fa0aa15e6 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfrm.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fme $ $Date: 2001-08-31 06:21:21 $
+ *  last change: $Author: ama $ $Date: 2001-10-19 10:16:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,6 @@ class SwTxtFormatter;
 class SwTxtFormatInfo;
 class SwParaPortion;
 class WidowsAndOrphans;
-class Sw3FrameIo;
 class SwBodyFrm;
 class SwFooterFrm;
 class SwTxtFtn;
@@ -315,11 +314,8 @@ public:
         { return (SwTxtNode*)SwCntntFrm::GetNode(); }
 
     SwTxtFrm(SwTxtNode * const);
-    SwTxtFrm( Sw3FrameIo&, SwLayoutFrm* );
     inline ~SwTxtFrm() { if( HasAnimation() ) ClearPara(); }
 
-    virtual void Store( Sw3FrameIo& ) const;
-
     // SwCntntFrm: der "kurze Dienstweg" fuer die Frames.
     // Wer den void* falsch casted ist selbst Schuld!
     // Auf jedenfall muss der void* auf 0 geprueft werden.
@@ -559,10 +555,13 @@ inline SwTwips SwTxtFrm::GetRightMargin() const
 }
 inline SwTwips SwTxtFrm::GrowTst( const SwTwips nGrow )
 {
+#ifdef VERTICAL_LAYOUT
+    return Grow( nGrow, sal_True );
+#else
     return Grow( nGrow, pHeight, sal_True );
+#endif
 }
 
-
 #ifdef DEBUG
 // fragt auf WYSIWYG DBG ab
 extern sal_Bool IsDbg( const SwTxtFrm *pFrm );