Switch to using multi_type_vector for cell storage.

The old style cell storage is no more.  Currently the code is buildable,
but crashes during unit test.

Change-Id: Ie688e22e95c7fb02b9e97b23df0fc1883a97945f

1 files changed, 15 insertions, 12 deletions

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index fb7c17573fb8..b1be68d7f977 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -7,15 +7,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SC_CELLVALUE_HXX__
-#define __SC_CELLVALUE_HXX__
+#ifndef SC_CELLVALUE_HXX
+#define SC_CELLVALUE_HXX
 
 #include "global.hxx"
+#include "mtvelements.hxx"
 
 class ScDocument;
 class ScFormulaCell;
 class EditTextObject;
-class ScBaseCell;
+class ScColumn;
 
 /**
  * Store arbitrary cell value of any kind.  It only stores cell value and
@@ -42,6 +43,12 @@ struct SC_DLLPUBLIC ScCellValue
 
     void clear();
 
+    void set( double fValue );
+    void set( const OUString& rStr );
+    void set( const EditTextObject& rEditText );
+    void set( const ScFormulaCell& rFormula );
+    void set( ScFormulaCell* pFormula );
+
     /**
      * Take cell value from specified position in specified document.
      */
@@ -50,11 +57,6 @@ struct SC_DLLPUBLIC ScCellValue
     void assign( const ScCellValue& rOther, ScDocument& rDestDoc, int nCloneFlags = SC_CLONECELL_DEFAULT );
 
     /**
-     * TODO: Remove this later.
-     */
-    void assign( const ScBaseCell& rCell );
-
-    /**
      * Set cell value at specified position in specified document.
      */
     void commit( ScDocument& rDoc, const ScAddress& rPos ) const;
@@ -66,6 +68,8 @@ struct SC_DLLPUBLIC ScCellValue
      */
     void release( ScDocument& rDoc, const ScAddress& rPos );
 
+    void release( ScColumn& rColumn, SCROW nRow );
+
     bool hasString() const;
 
     bool hasNumeric() const;
@@ -110,16 +114,15 @@ struct SC_DLLPUBLIC ScRefCellValue
      */
     void assign( ScDocument& rDoc, const ScAddress& rPos );
 
-    /**
-     * TODO: Remove this later.
-     */
-    void assign( ScBaseCell& rCell );
+    void assign( const sc::CellStoreType::const_iterator& itPos, size_t nOffset );
 
     /**
      * Set cell value at specified position in specified document.
      */
     void commit( ScDocument& rDoc, const ScAddress& rPos ) const;
 
+    void commit( ScColumn& rColumn, SCROW nRow ) const;
+
     bool hasString() const;
 
     bool hasNumeric() const;