Merged ScSharedCellEditSource with ScCellEditSource.

Again, this inheritance makes no sense.

2 files changed, 20 insertions, 31 deletions

diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 150e83ddba21..20de06cb99af 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -80,45 +80,34 @@ public:
     virtual void                UpdateData();
 };
 
-
-//  Data (incl. EditEngine) for cell EditSource is now shared in ScCellTextData
-
-class ScSharedCellEditSource : public SvxEditSource
+/**
+ * Data (incl. EditEngine) for cell EditSource is now shared in
+ * ScCellTextData.
+ *
+ * ScCellEditSource with local copy of ScCellTextData is used by
+ * ScCellFieldsObj, ScCellFieldObj.
+ */
+class ScCellEditSource : public SvxEditSource
 {
 private:
-    ScCellTextData*         pCellTextData;
-
-protected:
-    ScCellTextData*         GetCellTextData() const { return pCellTextData; }   // for ScCellEditSource
+    ScCellTextData* pCellTextData;
 
 public:
-                                ScSharedCellEditSource( ScCellTextData* pData );
-    virtual                     ~ScSharedCellEditSource();
+    ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP);
+    virtual ~ScCellEditSource();
 
     //  GetEditEngine is needed because the forwarder doesn't have field functions
-    ScEditEngineDefaulter*      GetEditEngine();
-
-    virtual SvxEditSource*      Clone() const;
-    virtual SvxTextForwarder*   GetTextForwarder();
+    ScEditEngineDefaulter* GetEditEngine();
 
-    virtual void                UpdateData();
+    virtual SvxEditSource* Clone() const;
+    virtual SvxTextForwarder* GetTextForwarder();
 
-    void                        SetDoUpdateData(sal_Bool bValue);
-    sal_Bool                    IsDirty() const;
-};
+    virtual void UpdateData();
 
-//  ScCellEditSource with local copy of ScCellTextData is used by ScCellFieldsObj, ScCellFieldObj
-
-class ScCellEditSource : public ScSharedCellEditSource
-{
-public:
-                                ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP );
-    virtual                     ~ScCellEditSource();
-
-    virtual SvxEditSource*      Clone() const;
+    void SetDoUpdateData(bool bValue);
+    bool IsDirty() const;
 };
 
-
 class ScAnnotationEditSource : public SvxEditSource, public SfxListener
 {
 private:
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 17d6d77a9a7f..5dccc865cbc0 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -49,7 +49,7 @@ class ScDocShell;
 class ScAddress;
 class ScCellObj;
 class ScSimpleEditSource;
-class ScSharedCellEditSource;
+class ScCellEditSource;
 class ScEditEngineDefaulter;
 class ScFieldEditEngine;
 
@@ -376,7 +376,7 @@ protected:
     ScAddress               aCellPos;
     ScFieldEditEngine*      pEditEngine;
     SvxEditEngineForwarder* pForwarder;
-    ScSharedCellEditSource* pOriginalSource;
+    ScCellEditSource* pOriginalSource;
     sal_Bool                    bDataValid;
     sal_Bool                    bInUpdate;
     sal_Bool                    bDirty;
@@ -396,7 +396,7 @@ public:
     void                    UpdateData();
     ScFieldEditEngine*      GetEditEngine() { GetTextForwarder(); return pEditEngine; }
 
-    ScSharedCellEditSource* GetOriginalSource();        // used as argument for SvxUnoText ctor
+    ScCellEditSource* GetOriginalSource();        // used as argument for SvxUnoText ctor
 
                             // used for ScCellEditSource:
     ScDocShell*             GetDocShell() const     { return pDocShell; }