diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/cellvalue.hxx | 7 | ||||
-rw-r--r-- | sc/source/core/data/cellvalue.cxx | 20 |
2 files changed, 1 insertions, 26 deletions
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx index 193cb967c3e7..dd07d1cdafad 100644 --- a/sc/inc/cellvalue.hxx +++ b/sc/inc/cellvalue.hxx @@ -43,8 +43,6 @@ struct SC_DLLPUBLIC ScCellValue ScCellValue( const ScRefCellValue& rCell ); ScCellValue( double fValue ); ScCellValue( const svl::SharedString& rString ); - ScCellValue( const EditTextObject& rEditText ); - ScCellValue( const ScFormulaCell& rFormula ); ScCellValue( const ScCellValue& r ); ~ScCellValue(); @@ -54,7 +52,6 @@ struct SC_DLLPUBLIC ScCellValue void set( double fValue ); void set( const svl::SharedString& rStr ); void set( const EditTextObject& rEditText ); - void set( const ScFormulaCell& rFormula ); void set( ScFormulaCell* pFormula ); /** @@ -80,10 +77,6 @@ struct SC_DLLPUBLIC ScCellValue void release( ScColumn& rColumn, SCROW nRow ); - bool hasString() const; - - bool hasNumeric() const; - bool isEmpty() const; bool equalsWithoutFormat( const ScCellValue& r ) const; diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx index bc7e234dfdd4..0a9d53db2004 100644 --- a/sc/source/core/data/cellvalue.cxx +++ b/sc/source/core/data/cellvalue.cxx @@ -177,9 +177,8 @@ ScCellValue::ScCellValue( const ScRefCellValue& rCell ) : meType(rCell.meType), } ScCellValue::ScCellValue( double fValue ) : meType(CELLTYPE_VALUE), mfValue(fValue) {} + ScCellValue::ScCellValue( const svl::SharedString& rString ) : meType(CELLTYPE_STRING), mpString(new svl::SharedString(rString)) {} -ScCellValue::ScCellValue( const EditTextObject& rEditText ) : meType(CELLTYPE_EDIT), mpEditText(rEditText.Clone()) {} -ScCellValue::ScCellValue( const ScFormulaCell& rFormula ) : meType(CELLTYPE_FORMULA), mpFormula(rFormula.Clone()) {} ScCellValue::ScCellValue( const ScCellValue& r ) : meType(r.meType), mfValue(r.mfValue) { @@ -271,13 +270,6 @@ void ScCellValue::set( const EditTextObject& rEditText ) mpEditText = rEditText.Clone(); } -void ScCellValue::set( const ScFormulaCell& rFormula ) -{ - clear(); - meType = CELLTYPE_FORMULA; - mpFormula = rFormula.Clone(); -} - void ScCellValue::set( ScFormulaCell* pFormula ) { clear(); @@ -450,16 +442,6 @@ void ScCellValue::release( ScColumn& rColumn, SCROW nRow ) mfValue = 0.0; } -bool ScCellValue::hasString() const -{ - return hasStringImpl(meType, mpFormula); -} - -bool ScCellValue::hasNumeric() const -{ - return hasNumericImpl(meType, mpFormula); -} - bool ScCellValue::isEmpty() const { return meType == CELLTYPE_NONE; |