1 files changed, 12 insertions, 9 deletions
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index d171bd0b0a26..ef2744aea127 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -28,6 +28,7 @@
 #define SW_FLYFRM_HXX
 
 #include "layfrm.hxx"
+#include <list>
 #include "frmfmt.hxx"
 
 class SwPageFrm;
@@ -38,8 +39,10 @@ class SwVirtFlyDrawObj;
 class SwSpzFrmFmts;
 class SwAttrSetChg;
 class PolyPolygon;
+class SwFlyDrawContact;
+class SwDrawContact;
+class SwFmt;
 
-// OD 2004-03-22 #i26791#
 #include <anchoredobject.hxx>
 
 //Sucht ausgehend von pOldAnch einen Anker fuer Absatzgebundene Rahmen.
@@ -58,18 +61,20 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
 {
     //darf Locken. Definiert in frmtool.cxx
     friend void AppendObjs   ( const SwSpzFrmFmts *, sal_uLong, SwFrm *, SwPageFrm * );
-    friend void AppendAllObjs( const SwSpzFrmFmts * );
     friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld,
                         const SwRect* pOldPrt );
 
     void InitDrawObj( sal_Bool bNotify );   //Wird von den CToren gerufen.
     void FinitDrawObj();                //Wird vom CTor gerufen.
 
-    void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &,
+    void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
                       SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
 
     using SwLayoutFrm::CalcRel;
 
+    sal_uInt32 _GetOrdNumForNewRef( const SwFlyDrawContact* );
+    SwVirtFlyDrawObj* CreateNewRef( SwFlyDrawContact* );
+
 protected:
 
     SwFlyFrm *pPrevLink,        // Vorgaenger/Nachfolger fuer Verkettung mit
@@ -131,7 +136,7 @@ protected:
     Size CalcRel( const SwFmtFrmSize &rSz ) const;
     SwTwips CalcAutoWidth() const;
 
-    SwFlyFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
+    SwFlyFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
 
     /** method to assure that anchored object is registered at the correct
         page frame
@@ -142,20 +147,17 @@ protected:
     */
     virtual void RegisterAtCorrectPage();
 
-    // --> OD 2006-08-10 #i68520#
     virtual bool _SetObjTop( const SwTwips _nTop );
     virtual bool _SetObjLeft( const SwTwips _nLeft );
-    // <--
 
-    // --> OD 2006-10-05 #i70122#
     virtual const SwRect GetObjBoundRect() const;
-    // <--
+    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
+
 public:
     // OD 2004-03-23 #i26791#
     TYPEINFO();
 
     virtual ~SwFlyFrm();
-    virtual void Modify( SfxPoolItem*, SfxPoolItem* );
         // erfrage vom Client Informationen
     virtual sal_Bool GetInfo( SfxPoolItem& ) const;
     virtual void Paint( SwRect const&,
@@ -284,6 +286,7 @@ public:
         @author OD
     */
     virtual bool IsFormatPossible() const;
+    static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt );
 
     // overwriting "SwFrmFmt *SwLayoutFrm::GetFmt" to provide the correct derived return type.
     // (This is in order to skip on the otherwise necessary casting of the result to