sc/inc/cellvalue.hxx | 6 ++---
sc/source/core/data/cellvalue.cxx | 18 -----------------
sc/source/filter/inc/XclExpChangeTrack.hxx | 4 ---
sc/source/filter/inc/xehelper.hxx | 2 -
sc/source/filter/inc/xicontent.hxx | 2 -
sc/source/filter/inc/xihelper.hxx | 1
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 1
sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx | 1
sc/source/ui/inc/docfunc.hxx | 1
sc/source/ui/inc/undocell.hxx | 1
10 files changed, 3 insertions(+), 34 deletions(-)
New commits:
commit 32570f9722cf82948716930ea2fef8e5a6d3bf79
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Mon Mar 25 23:49:36 2013 -0400
A bit more cleanup.
Change-Id: Iac576af6a9f1f8edda6ce7498862ece813959cf7
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 9b7ea19..9dd3a9a 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -48,6 +48,9 @@ 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 );
/**
@@ -75,9 +78,6 @@ struct SC_DLLPUBLIC ScCellValue
void swap( ScCellValue& r );
};
-// TODO: temporary workaround. To be removed later.
-ScBaseCell* getHackedBaseCell( ScDocument* pDoc, const ScCellValue& rVal );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index c5006c7..8b0baa4 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -352,22 +352,4 @@ void ScCellValue::swap( ScCellValue& r )
std::swap(mfValue, r.mfValue);
}
-ScBaseCell* getHackedBaseCell( ScDocument* pDoc, const ScCellValue& rVal )
-{
- switch (rVal.meType)
- {
- case CELLTYPE_STRING:
- return new ScStringCell(*rVal.mpString);
- case CELLTYPE_EDIT:
- return new ScEditCell(rVal.mpEditText->Clone(), pDoc);
- case CELLTYPE_VALUE:
- return new ScValueCell(rVal.mfValue);
- case CELLTYPE_FORMULA:
- return rVal.mpFormula->Clone();
- default:
- ;
- }
- return NULL;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index cf63174..b13de41 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -30,10 +30,6 @@
#include "excrecds.hxx"
//___________________________________________________________________
-
-class ScBaseCell;
-
-//___________________________________________________________________
// XclExpUserBView - one UserBView record for each user
class XclExpUserBView : public ExcRecord
diff --git a/sc/source/filter/inc/xehelper.hxx
b/sc/source/filter/inc/xehelper.hxx
index b67d264..b5e5a89 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -208,8 +208,6 @@ private:
class EditEngine;
class EditTextObject;
class SdrTextObj;
-class ScStringCell;
-class ScEditCell;
class ScPatternAttr;
/** This class provides methods to create an XclExpString.
diff --git a/sc/source/filter/inc/xicontent.hxx
b/sc/source/filter/inc/xicontent.hxx
index c5d7aae..851673a 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -45,8 +45,6 @@ globals for the document).
// Shared string table ========================================================
-class ScBaseCell;
-
/** The SST (shared string table) contains all strings used in a BIFF8 file.
This class loads the SST, provides access to the strings, and is able to
diff --git a/sc/source/filter/inc/xihelper.hxx
b/sc/source/filter/inc/xihelper.hxx
index 84eb924..33f7cea 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -94,7 +94,6 @@ public:
// String->EditEngine conversion ==============================================
-class ScBaseCell;
class EditTextObject;
/** This class provides methods to convert an XclImpString.
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index e810e84..d2b94f9 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -30,7 +30,6 @@
class ScChangeAction;
class ScChangeTrack;
class ScXMLExport;
-class ScBaseCell;
class ScCellValue;
class ScChangeActionDel;
class ScBigRange;
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index 2f46d58..fe7b167 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -24,7 +24,6 @@
#include <list>
#include <com/sun/star/util/DateTime.hpp>
-class ScBaseCell;
class ScDocument;
class DateTime;
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 6b6d1d4..e0dd46f 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -38,7 +38,6 @@ class ScMarkData;
class ScPatternAttr;
class ScRange;
class ScRangeList;
-class ScBaseCell;
class ScFormulaCell;
class ScTokenArray;
struct ScTabOpParam;
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 26005ae..c6e0ae0 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -28,7 +28,6 @@
#include <boost/scoped_ptr.hpp>
class ScDocShell;
-class ScBaseCell;
class ScPatternAttr;
class EditTextObject;
class SdrUndoAction;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
