CWS swlayoutrefactoring: #i81480#: enable sw code to use multiple layouts

1 files changed, 11 insertions, 4 deletions

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 6cc14bbbf2c2..8bdf86af3a38 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -64,6 +64,7 @@ class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
 class SwTabFrm;
+class SwRootFrm;
 class SwTable;
 class SwTableNode;
 class SwTableBox;
@@ -402,8 +403,12 @@ public:
 
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 
-    virtual SwCntntFrm *MakeFrm() = 0;
+    // MakeFrm will be called for a certain layout
+    // pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent)
+    virtual SwCntntFrm *MakeFrm( SwFrm* pSib ) = 0;
+
     virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0;
+
     virtual SwCntntNode *JoinNext();
     virtual SwCntntNode *JoinPrev();
     // koennen 2 Nodes zusammengefasst werden ?
@@ -417,7 +422,9 @@ public:
     BOOL GoNext(SwIndex *, USHORT nMode ) const;
     BOOL GoPrevious(SwIndex *, USHORT nMode ) const;
 
-    SwCntntFrm *GetFrm( const Point* pDocPos = 0,
+    // Replacement for good old GetFrm(..):
+    SwCntntFrm *getLayoutFrm( const SwRootFrm*,
+                        const Point* pDocPos = 0,
                         const SwPosition *pPos = 0,
                         const BOOL bCalcFrm = TRUE ) const;
     // Gibt die tatsaechlcheGroesse des Frames zurueck bzw. ein leeres
@@ -525,7 +532,7 @@ public:
 
     const SwTable& GetTable() const { return *pTable; }
     SwTable& GetTable() { return *pTable; }
-    SwTabFrm *MakeFrm();
+    SwTabFrm *MakeFrm( SwFrm* );
 
     //Legt die Frms fuer den TableNode (also die TabFrms) an.
     void MakeFrms( SwNodeIndex* pIdxBehind );
@@ -572,7 +579,7 @@ public:
     const SwSection& GetSection() const { return *m_pSection; }
           SwSection& GetSection()       { return *m_pSection; }
 
-    SwFrm *MakeFrm();
+    SwFrm *MakeFrm( SwFrm* );
 
     //Legt die Frms fuer den SectionNode (also die SectionFrms) an.
     //Im Defaultfall wird bis die Frames bis zum Ende des Bereichs angelegt,