CWS swlayoutrefactoring: #i115510#: first step to clean up the SwClient mess

1 files changed, 2 insertions, 5 deletions

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index d1a33db7b246..f12ac15f5d69 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -44,9 +44,6 @@ class SwDoc;
 
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
-//  friend class SwSwgReader;
-//  friend class SwSwgWriter;
-
     String aFmtName;
     SwAttrSet aSet;
 
@@ -70,6 +67,7 @@ protected:
     SwFmt( SwAttrPool& rPool, const String &rFmtNm, const USHORT* pWhichRanges,
             SwFmt *pDrvdFrm, USHORT nFmtWhich );
     SwFmt( const SwFmt& rFmt );
+   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
 
 public:
     TYPEINFO();     //Bereits in Basisklasse Client drin.
@@ -80,7 +78,6 @@ public:
     // fuer die Abfrage der Writer-Funktionen
     USHORT Which() const { return nWhichId; }
 
-    virtual void Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue );
         // erfrage vom Format Informationen
     virtual BOOL GetInfo( SfxPoolItem& ) const;
 
@@ -114,7 +111,7 @@ public:
     virtual USHORT ResetAllFmtAttr();
     // <--
 
-    inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
+    inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); }
     inline BOOL IsDefault() const { return DerivedFrom() == 0; }
 
     inline const String& GetName() const        { return aFmtName; }