[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

Kohei Yoshida kohei.yoshida at gmail.com
Thu Mar 28 09:37:00 PDT 2013


 sc/source/core/inc/interpre.hxx  |    1 
 sc/source/core/tool/interpr4.cxx |   49 ---------------------------------------
 2 files changed, 50 deletions(-)

New commits:
commit 257da51a514e9cfe9f8b371c5bb71a798d00c05a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Mar 28 12:39:24 2013 -0400

    We don't need this now.
    
    Change-Id: I12d2e79708d712829d96aac43fe63de2b04c6c07

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6fd8dc3..c565e47 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -191,7 +191,6 @@ double GetCellValue( const ScAddress&, ScRefCellValue& rCell );
 double GetCellValueOrZero( const ScAddress&, ScRefCellValue& rCell );
 double GetValueCellValue( const ScAddress&, double fOrig );
 ScBaseCell* GetCell( const ScAddress& rPos );
-void GetCellString( String& rStr, const ScBaseCell* pCell );
 void GetCellString( OUString& rStr, ScRefCellValue& rCell );
 sal_uInt16 GetCellErrCode( const ScRefCellValue& rCell );
 
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 4610a77..e624c89 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -515,55 +515,6 @@ ScBaseCell* ScInterpreter::GetCell( const ScAddress& rPos )
     return pDok->GetCell( rPos );
 }
 
-void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetCellString" );
-    sal_uInt16 nErr = 0;
-    if (pCell)
-    {
-        switch (pCell->GetCellType())
-        {
-            case CELLTYPE_STRING:
-                rStr = ((ScStringCell*) pCell)->GetString();
-            break;
-            case CELLTYPE_EDIT:
-                rStr = ((ScEditCell*) pCell)->GetString();
-            break;
-            case CELLTYPE_FORMULA:
-            {
-                ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
-                nErr = pFCell->GetErrCode();
-                if (pFCell->IsValue())
-                {
-                    double fVal = pFCell->GetValue();
-                    sal_uLong nIndex = pFormatter->GetStandardFormat(
-                                        NUMBERFORMAT_NUMBER,
-                                        ScGlobal::eLnge);
-                    pFormatter->GetInputLineString(fVal, nIndex, rStr);
-                }
-                else
-                    rStr = pFCell->GetString();
-            }
-            break;
-            case CELLTYPE_VALUE:
-            {
-                double fVal = ((ScValueCell*) pCell)->GetValue();
-                sal_uLong nIndex = pFormatter->GetStandardFormat(
-                                        NUMBERFORMAT_NUMBER,
-                                        ScGlobal::eLnge);
-                pFormatter->GetInputLineString(fVal, nIndex, rStr);
-            }
-            break;
-            default:
-                rStr = ScGlobal::GetEmptyString();
-            break;
-        }
-    }
-    else
-        rStr = ScGlobal::GetEmptyString();
-    SetError(nErr);
-}
-
 void ScInterpreter::GetCellString( OUString& rStr, ScRefCellValue& rCell )
 {
     sal_uInt16 nErr = 0;


More information about the Libreoffice-commits mailing list