Remove broadcaster from ScBaseCell, remove ScNoteCell and CELLTYPE_NOTE...

and Calc is now officially broken.  Let's start fixing this bit by bit...

Change-Id: I383c88245fe1e573666da636c6a8ca8815352ce7

5 files changed, 9 insertions, 38 deletions

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 7b7019cc1ada..ef7c2f731b21 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -69,17 +69,6 @@ public:
         Returns false for formula cells returning nothing, use HasEmptyData() for that. */
     bool            IsBlank() const;
 
-    /** Returns true, if the cell contains a broadcaster. */
-    inline bool     HasBroadcaster() const { return mpBroadcaster != 0; }
-    /** Returns the pointer to the cell broadcaster. */
-    inline SvtBroadcaster* GetBroadcaster() const { return mpBroadcaster; }
-    /** Takes ownership of the passed cell broadcaster. */
-    void            TakeBroadcaster( SvtBroadcaster* pBroadcaster );
-    /** Returns and forgets the own cell broadcaster. Caller takes ownership! */
-    SvtBroadcaster* ReleaseBroadcaster();
-    /** Deletes the own cell broadcaster. */
-    void            DeleteBroadcaster();
-
     /** ScFormulaCell with formula::svEmptyCell result, or ScNoteCell (may have been
         created due to reference to empty cell). */
     bool            HasEmptyData() const;
@@ -90,33 +79,10 @@ public:
 private:
     ScBaseCell&     operator=( const ScBaseCell& );
 
-private:
-    SvtBroadcaster* mpBroadcaster;  /// Broadcaster for changed values. Cell takes ownership!
-
 protected:
     sal_uInt8            eCellType;      // enum CellType - sal_uInt8 spart Speicher
 };
 
-// ============================================================================
-
-class ScNoteCell : public ScBaseCell
-{
-public:
-#ifdef USE_MEMPOOL
-    DECL_FIXEDMEMPOOL_NEWDEL( ScNoteCell )
-#endif
-
-    /** Cell takes ownership of the passed broadcaster. */
-    explicit        ScNoteCell( SvtBroadcaster* pBC = 0 );
-
-#if OSL_DEBUG_LEVEL > 0
-                    ~ScNoteCell();
-#endif
-
-private:
-                    ScNoteCell( const ScNoteCell& );
-};
-
 class ScValueCell : public ScBaseCell
 {
 public:
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ed1392a6936f..907074db06f7 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -119,8 +119,8 @@ struct ColDoubleEntry
 class ScColumn
 {
     // Broadcaster storage container
-    typedef mdds::mtv::custom_block_func1<sc::element_type_broadcaster, sc::custom_broadcaster_block> BroadcasterBlkFunc;
-    typedef mdds::multi_type_vector<BroadcasterBlkFunc> BroadcasterStoreType;
+    typedef mdds::mtv::custom_block_func1<sc::element_type_broadcaster, sc::custom_broadcaster_block> BCBlkFunc;
+    typedef mdds::multi_type_vector<BCBlkFunc> BCStoreType;
 
     typedef mdds::multi_type_vector<mdds::mtv::element_block_func> TextWidthType;
     typedef mdds::multi_type_vector<mdds::mtv::element_block_func> ScriptType;
@@ -133,7 +133,7 @@ class ScColumn
     // Script types are stored as unsigned char.
     ScriptType maScriptTypes;
 
-    BroadcasterStoreType maBroadcasters;
+    BCStoreType maBroadcasters;
 
     SCCOL           nCol;
     SCTAB           nTab;
@@ -473,6 +473,8 @@ public:
 
     void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
 
+    SvtBroadcaster* GetBroadcaster( SCROW nRow );
+
 private:
     const ScFormulaCell* FetchFormulaCell( SCROW nRow ) const;
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0920dd5e71ba..79a062681f77 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1967,6 +1967,8 @@ private: // CLOOK-Impl-methods
         ScDocument* mpDoc;
     };
 
+    SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
+
     bool TableExists( SCTAB nTab ) const;
 
     void    MergeNumberFormatter(ScDocument* pSrcDoc);
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 0ef1bd8fdc3c..f823232a488a 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -286,7 +286,6 @@ enum CellType
         CELLTYPE_VALUE,
         CELLTYPE_STRING,
         CELLTYPE_FORMULA,
-        CELLTYPE_NOTE,
         CELLTYPE_EDIT,
 #if OSL_DEBUG_LEVEL > 0
         CELLTYPE_DESTROYED
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c090f8bb313f..c7b3498d726c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -831,6 +831,8 @@ public:
 
     ScRefCellValue GetRefCellValue( SCCOL nCol, SCROW nRow );
 
+    SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow );
+
     /** Replace behaves differently to the Search; adjust the rCol and rRow accordingly.
 
         'Replace' replaces at the 'current' position, but in order to achieve