1 files changed, 15 insertions, 8 deletions

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9ee05188898c..4ff69260b044 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;
@@ -81,9 +82,8 @@ class IDocumentLineNumberAccess;
 class IDocumentLinksAdministration;
 class IDocumentFieldsAccess;
 class IDocumentContentOperations;
-// --> OD 2007-10-31 #i83479#
 class IDocumentListItems;
-// <--
+class SwOLENodes;
 
 // --------------------
 // class SwNode
@@ -397,13 +397,17 @@ protected:
     // SwAttrSet (handle):
     sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds );
 
+   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
+
 public:
     TYPEINFO();     //Bereits in Basisklasse Client drin.
 
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+    // 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 SwCntntFrm *MakeFrm() = 0;
     virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0;
+
     virtual SwCntntNode *JoinNext();
     virtual SwCntntNode *JoinPrev();
     // koennen 2 Nodes zusammengefasst werden ?
@@ -417,7 +421,9 @@ public:
     sal_Bool GoNext(SwIndex *, sal_uInt16 nMode ) const;
     sal_Bool GoPrevious(SwIndex *, sal_uInt16 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 sal_Bool bCalcFrm = sal_True ) const;
     // Gibt die tatsaechlcheGroesse des Frames zurueck bzw. ein leeres
@@ -501,11 +507,12 @@ public:
     inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
     inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
 
+    static SwOLENodes* CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize );
+
 private:
     // privater Constructor, weil nie kopiert werden darf !!
     SwCntntNode( const SwCntntNode & rNode );
     SwCntntNode & operator= ( const SwCntntNode & rNode );
-
 };
 
 
@@ -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,