No more ScSharedHeaderFooterEditSource.

This shared base class makes no sense. Let's keep it simple.

sc/inc/editsrc.hxx

@@ -58,41 +58,27 @@ public:
     sal_uInt16          GetPart() const         { return nPart; }
 };
 
-
-//  all ScSharedHeaderFooterEditSource objects for a single text share the same data
-
-class ScSharedHeaderFooterEditSource : public SvxEditSource
+/**
+ * ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is
+ * used by field objects.
+ */
+class ScHeaderFooterEditSource : public SvxEditSource
 {
 private:
     ScHeaderFooterTextData*     pTextData;
 
-protected:
-    ScHeaderFooterTextData*     GetTextData() const { return pTextData; }   // for ScHeaderFooterEditSource
-
 public:
-                                ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData );
-    virtual                     ~ScSharedHeaderFooterEditSource();
+    ScHeaderFooterEditSource(ScHeaderFooterTextData* pData);
+    ScHeaderFooterEditSource(ScHeaderFooterContentObj* pContent, sal_uInt16 nP);
+    ScHeaderFooterEditSource(ScHeaderFooterContentObj& rContent, sal_uInt16 nP);
+    virtual ~ScHeaderFooterEditSource();
 
     //  GetEditEngine is needed because the forwarder doesn't have field functions
     ScEditEngineDefaulter*      GetEditEngine();
 
-    virtual SvxEditSource*      Clone() const ;
+    virtual SvxEditSource*      Clone() const;
     virtual SvxTextForwarder*   GetTextForwarder();
-
     virtual void                UpdateData();
-
-};
-
-//  ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is used by field objects
-
-class ScHeaderFooterEditSource : public ScSharedHeaderFooterEditSource
-{
-public:
-                                ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, sal_uInt16 nP );
-                                ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, sal_uInt16 nP );
-    virtual                     ~ScHeaderFooterEditSource();
-
-    virtual SvxEditSource*      Clone() const;
 };
 
 

sc/source/ui/unoobj/editsrc.cxx

@@ -65,63 +65,43 @@ ScHeaderFooterChangedHint::~ScHeaderFooterChangedHint()
 
 //------------------------------------------------------------------------
 
-ScSharedHeaderFooterEditSource::ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData ) :
-    pTextData( pData )
-{
-    //  pTextData is held by the ScHeaderFooterTextObj.
-    //  Text range and cursor keep a reference to their parent text, so the text object is
-    //  always alive and the TextData is valid as long as there are children.
-}
+//  each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData
 
-ScSharedHeaderFooterEditSource::~ScSharedHeaderFooterEditSource()
-{
-}
+ScHeaderFooterEditSource::ScHeaderFooterEditSource(ScHeaderFooterTextData* pData) :
+    pTextData(pData) {}
 
-SvxEditSource* ScSharedHeaderFooterEditSource::Clone() const
-{
-    return new ScSharedHeaderFooterEditSource( pTextData );
-}
+ScHeaderFooterEditSource::ScHeaderFooterEditSource(
+    ScHeaderFooterContentObj* pContent, sal_uInt16 nP) :
+    pTextData(new ScHeaderFooterTextData(*pContent, nP)) {}
 
-SvxTextForwarder* ScSharedHeaderFooterEditSource::GetTextForwarder()
-{
-    return pTextData->GetTextForwarder();
-}
+ScHeaderFooterEditSource::ScHeaderFooterEditSource(
+    ScHeaderFooterContentObj& rContent, sal_uInt16 nP) :
+    pTextData(new ScHeaderFooterTextData(rContent, nP)) {}
 
-void ScSharedHeaderFooterEditSource::UpdateData()
+ScHeaderFooterEditSource::~ScHeaderFooterEditSource()
 {
-    pTextData->UpdateData();
+    delete pTextData;   // not accessed in ScSharedHeaderFooterEditSource dtor
 }
 
-ScEditEngineDefaulter* ScSharedHeaderFooterEditSource::GetEditEngine()
+ScEditEngineDefaulter* ScHeaderFooterEditSource::GetEditEngine()
 {
     return pTextData->GetEditEngine();
 }
 
-//------------------------------------------------------------------------
-
-//  each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData
-
-ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent,
-                                                    sal_uInt16 nP ) :
-    ScSharedHeaderFooterEditSource( new ScHeaderFooterTextData( *pContent, nP ) )
-{
-}
-
-ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent,
-                                                    sal_uInt16 nP ) :
-    ScSharedHeaderFooterEditSource( new ScHeaderFooterTextData( rContent, nP ) )
+SvxEditSource* ScHeaderFooterEditSource::Clone() const
 {
+    return new ScHeaderFooterEditSource(
+        pTextData->GetContentObj(), pTextData->GetPart());
 }
 
-ScHeaderFooterEditSource::~ScHeaderFooterEditSource()
+SvxTextForwarder* ScHeaderFooterEditSource::GetTextForwarder()
 {
-    delete GetTextData();   // not accessed in ScSharedHeaderFooterEditSource dtor
+    return pTextData->GetTextForwarder();
 }
 
-SvxEditSource* ScHeaderFooterEditSource::Clone() const
+void ScHeaderFooterEditSource::UpdateData()
 {
-    const ScHeaderFooterTextData* pData = GetTextData();
-    return new ScHeaderFooterEditSource( pData->GetContentObj(), pData->GetPart() );
+    pTextData->UpdateData();
 }
 
 //------------------------------------------------------------------------

sc/source/ui/unoobj/textuno.cxx

@@ -335,7 +335,8 @@ void ScHeaderFooterTextObj::CreateUnoText_Impl()
     if ( !pUnoText )
     {
         //  can't be aggregated because getString/setString is handled here
-        ScSharedHeaderFooterEditSource aEditSource( &aTextData );
+        ScHeaderFooterEditSource aEditSource(
+            new ScHeaderFooterTextData(aTextData.GetContentObj(), aTextData.GetPart()));
         pUnoText = new SvxUnoText( &aEditSource, lcl_GetHdFtPropertySet(), uno::Reference<text::XText>() );
         pUnoText->acquire();
     }