summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-24 09:22:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-25 14:19:01 +0100
commit810a01c5cf67f276f37ecda954363cf3c3b5385c (patch)
tree30c5365e050eb81ce7faf977b0ba0f274538535c
parent4e46ab162a1d6b757aec3629e193e2df65c38bb7 (diff)
callcatcher: remove some more unused code
Change-Id: Id60fe0dade7f47f8b2b65bf2cfa1d6ab28a94505
-rw-r--r--sc/inc/dbdata.hxx1
-rw-r--r--sc/inc/simplerangelist.hxx3
-rw-r--r--sc/source/core/tool/dbdata.cxx5
-rw-r--r--sc/source/core/tool/simplerangelist.cxx34
-rwxr-xr-xunusedcode.easy3
5 files changed, 0 insertions, 46 deletions
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 6534ac61b03a..d607b4eeae44 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -214,7 +214,6 @@ public:
const ScDBData* findByRange(const ScRange& rRange) const;
ScDBData* getByRange(const ScRange& rRange);
void insert(ScDBData* p);
- void erase(iterator itr);
bool empty() const;
bool operator== (const AnonDBs& r) const;
};
diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx
index 611bfaeaf846..2934513a96f9 100644
--- a/sc/inc/simplerangelist.hxx
+++ b/sc/inc/simplerangelist.hxx
@@ -55,8 +55,6 @@ public:
SCCOL mnCol2;
SCROW mnRow2;
explicit Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
-
- bool contains(const Range& r) const;
};
typedef ::boost::shared_ptr< ::std::list<Range> > RangeListRef;
typedef ::std::map<SCTAB, RangeListRef> TabType;
@@ -65,7 +63,6 @@ public:
void addRange(const ScRange& rRange);
void insertCol(SCCOL nCol, SCTAB nTab);
- void insertRow(SCROW nRow, SCTAB nTab);
void getRangeList(::std::list<ScRange>& rList) const;
void clear();
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index bb5475cb725d..3e6664dbdbb3 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -816,11 +816,6 @@ void ScDBCollection::AnonDBs::insert(ScDBData* p)
maDBs.push_back(pNew);
}
-void ScDBCollection::AnonDBs::erase(iterator itr)
-{
- maDBs.erase(itr);
-}
-
bool ScDBCollection::AnonDBs::empty() const
{
return maDBs.empty();
diff --git a/sc/source/core/tool/simplerangelist.cxx b/sc/source/core/tool/simplerangelist.cxx
index 60c2ca861cd5..d31fe9be87a6 100644
--- a/sc/source/core/tool/simplerangelist.cxx
+++ b/sc/source/core/tool/simplerangelist.cxx
@@ -38,11 +38,6 @@ using ::std::max;
ScSimpleRangeList::Range::Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) :
mnCol1(nCol1), mnRow1(nRow1), mnCol2(nCol2), mnRow2(nRow2) {}
-bool ScSimpleRangeList::Range::contains(const Range& r) const
-{
- return mnCol1 <= r.mnCol1 && mnRow1 <= r.mnRow1 && r.mnCol2 <= mnCol2 && r.mnRow2 <= mnRow2;
-}
-
// ----------------------------------------------------------------------------
ScSimpleRangeList::ScSimpleRangeList()
@@ -168,35 +163,6 @@ void ScSimpleRangeList::insertCol(SCCOL nCol, SCTAB nTab)
}
}
-void ScSimpleRangeList::insertRow(SCROW nRow, SCTAB nTab)
-{
- RangeListRef pRef = findTab(nTab);
- if (!pRef)
- // This should never happen!
- return;
-
- list<Range>::iterator itr = pRef->begin(), itrEnd = pRef->end();
- for (; itr != itrEnd; ++itr)
- {
- Range& r = *itr;
- if (r.mnRow2 < nRow)
- // insertion point is below the range.
- continue;
-
- if (nRow <= r.mnRow1)
- {
- // insertion point is above the range.
- ++r.mnRow1;
- ++r.mnRow2;
- }
- else if (nRow <= r.mnRow2)
- {
- // insertion point cuts through the range.
- ++r.mnRow2;
- }
- }
-}
-
void ScSimpleRangeList::getRangeList(list<ScRange>& rList) const
{
list<ScRange> aList;
diff --git a/unusedcode.easy b/unusedcode.easy
index be8bcde81085..cc97539334ef 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -34,8 +34,6 @@ ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
-ScCondFrmtItem::ScCondFrmtItem(unsigned short, ScConditionalFormat const&)
-ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
@@ -50,7 +48,6 @@ ScRTFColTwips::Remove(unsigned long const&, unsigned short)
ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short)
ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short)