summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-30 10:29:19 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-01 10:43:24 +0000
commit58aea3f36c14414f95668e229a7350598f6c53a8 (patch)
tree70c115dffd44576313cefd49e4164d293895e4bd /sc
parent3fcbfe10857631212d8b8db9a079bb9692ed78bc (diff)
loplugin:unusedmethods
- improvements to the plugin to find more method calls - improvements to python script to remove more false+ - fix the FORCE_COMPILE_ALL build flag to include code in the $WORKDIR Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836 Reviewed-on: https://gerrit.libreoffice.org/19064 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/address.hxx5
-rw-r--r--sc/inc/bigrange.hxx3
-rw-r--r--sc/inc/calcconfig.hxx2
-rw-r--r--sc/inc/chgtrack.hxx7
-rw-r--r--sc/inc/convuno.hxx7
-rw-r--r--sc/inc/mtvcellfunc.hxx30
-rw-r--r--sc/inc/mtvfunctions.hxx149
-rw-r--r--sc/inc/rangelst.hxx1
-rw-r--r--sc/source/core/tool/calcconfig.cxx32
-rw-r--r--sc/source/core/tool/rangelst.cxx9
10 files changed, 0 insertions, 245 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 9c062b82b531..460ca2cc552e 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -131,11 +131,6 @@ SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab )
return nTab < 0 ? 0 : (nTab > MAXTAB ? MAXTAB : nTab);
}
-SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab )
-{
- return nTab < 0 ? 0 : (nTab > nMaxTab ? nMaxTab : nTab);
-}
-
// ScAddress
// The old cell address is combined in one UINT32:
// +---+---+-------+
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index bcf784a85964..14b2aa92535c 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -192,9 +192,6 @@ public:
{ return (aStart == r.aStart) && (aEnd == r.aEnd); }
bool operator!=( const ScBigRange& r ) const
{ return !operator==( r ); }
-
- friend inline SvStream& WriteScBigRange( SvStream& rStream, const ScBigRange& rRange );
- friend inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange );
};
inline bool ScBigRange::In( const ScBigAddress& rAddr ) const
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 1d28a60f93a7..29337eafc764 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -67,8 +67,6 @@ struct SC_DLLPUBLIC ScCalcConfig
bool operator!= (const ScCalcConfig& r) const;
};
-SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig);
-
SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes);
SC_DLLPUBLIC ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes);
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index c876aeebfaf2..88bdb277a4f8 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -449,11 +449,6 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry
ScChangeActionMove* pMove,
short nFrom, short nTo );
- ScChangeActionDelMoveEntry* GetNext()
- {
- return static_cast<ScChangeActionDelMoveEntry*>(
- ScChangeActionLinkEntry::GetNext());
- }
inline ScChangeActionMove* GetMove();
public:
@@ -483,8 +478,6 @@ class ScChangeActionDel : public ScChangeAction
ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* );
virtual ~ScChangeActionDel();
- ScChangeActionIns* GetCutOffInsert() { return pCutOff; }
-
virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE;
virtual void DeleteCellEntries() SAL_OVERRIDE;
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index f2c4c20ed835..7ea3212cd734 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -137,13 +137,6 @@ inline bool operator==(
(rApiAddress1.Sheet == rApiAddress2.Sheet);
}
-inline bool operator!=(
- const ::com::sun::star::table::CellAddress& rApiAddress1,
- const ::com::sun::star::table::CellAddress& rApiAddress2 )
-{
- return !(rApiAddress1 == rApiAddress2);
-}
-
inline bool operator==(
const ::com::sun::star::table::CellRangeAddress& rApiRange1,
const ::com::sun::star::table::CellRangeAddress& rApiRange2 )
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index 54ffc9b03067..d0fd9a1cd734 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -42,24 +42,6 @@ ProcessFormula(
}
template<typename _Func>
-typename CellStoreType::iterator
-ProcessFormulaNumeric(
- const CellStoreType::iterator& itPos, CellStoreType& rStore, SCROW nRow1, SCROW nRow2, _Func& rFunc)
-{
- FuncElseNoOp<size_t> aElse;
- return ProcessElements2<
- CellStoreType, numeric_block, formula_block, _Func, FuncElseNoOp<size_t> >(
- itPos, rStore, nRow1, nRow2, rFunc, aElse);
-}
-
-template<typename _Func>
-void ProcessEditText(CellStoreType& rStore, _Func& rFunc)
-{
- FuncElseNoOp<size_t> aElse;
- ProcessElements1<CellStoreType, edittext_block, _Func, FuncElseNoOp<size_t> >(rStore, rFunc, aElse);
-}
-
-template<typename _Func>
CellStoreType::iterator
ProcessEditText(const CellStoreType::iterator& itPos, CellStoreType& rStore, SCROW nRow1, SCROW nRow2, _Func& rFunc)
{
@@ -112,18 +94,6 @@ ParseAllNonEmpty(
itPos, rCells, nRow1, nRow2, rFunc, aElse);
}
-template<typename _FuncElem, typename _FuncElse>
-typename CellStoreType::const_iterator
-ParseAllNonEmpty(
- const typename CellStoreType::const_iterator& itPos, const CellStoreType& rCells,
- SCROW nRow1, SCROW nRow2, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
- return ParseElements4<CellStoreType,
- numeric_block, string_block, edittext_block, formula_block,
- _FuncElem, _FuncElse>(
- itPos, rCells, nRow1, nRow2, rFuncElem, rFuncElse);
-}
-
template<typename _Func>
typename CellStoreType::const_iterator
ParseFormulaNumeric(
diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx
index 2f701de0efa4..028e73c96aae 100644
--- a/sc/inc/mtvfunctions.hxx
+++ b/sc/inc/mtvfunctions.hxx
@@ -374,155 +374,6 @@ void ProcessElements2(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncEls
}
}
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _FuncElem, typename _FuncElse>
-typename _StoreT::iterator
-ProcessElements2(
- const typename _StoreT::iterator& itPos, _StoreT& rStore,
- typename _StoreT::size_type nStart, typename _StoreT::size_type nEnd,
- _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
- typedef std::pair<typename _StoreT::iterator, typename _StoreT::size_type> PositionType;
-
- PositionType aPos = rStore.position(itPos, nStart);
- typename _StoreT::iterator it = aPos.first;
- typename _StoreT::size_type nOffset = aPos.second;
- typename _StoreT::size_type nDataSize = 0;
- typename _StoreT::size_type nTopRow = nStart;
-
- for (; it != rStore.end() && nTopRow <= nEnd; ++it, nOffset = 0, nTopRow += nDataSize)
- {
- bool bLastBlock = false;
- nDataSize = it->size - nOffset;
- if (nTopRow + nDataSize - 1 > nEnd)
- {
- // Truncate the block.
- nDataSize = nEnd - nTopRow + 1;
- bLastBlock = true;
- }
-
- switch (it->type)
- {
- case _Blk1::block_type:
- EachElem<_Blk1, typename _Blk1::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- case _Blk2::block_type:
- EachElem<_Blk2, typename _Blk2::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- default:
- rFuncElse(it->type, nTopRow, nDataSize);
- }
-
- if (bLastBlock)
- break;
- }
-
- return it;
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _FuncElem, typename _FuncElse>
-void ProcessElements3(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
- typename _StoreT::size_type nTopRow = 0, nDataSize = 0;
- typename _StoreT::iterator it = rStore.begin(), itEnd = rStore.end();
- for (; it != itEnd; ++it, nTopRow += nDataSize)
- {
- nDataSize = it->size;
- switch (it->type)
- {
- case _Blk1::block_type:
- EachElem<_Blk1, typename _Blk1::iterator>(*it, rFuncElem);
- break;
- case _Blk2::block_type:
- EachElem<_Blk2, typename _Blk2::iterator>(*it, rFuncElem);
- break;
- case _Blk3::block_type:
- EachElem<_Blk3, typename _Blk3::iterator>(*it, rFuncElem);
- break;
- default:
- rFuncElse(it->type, nTopRow, nDataSize);
- }
- }
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _Blk4, typename _FuncElem, typename _FuncElse>
-void ProcessElements4(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
- typename _StoreT::size_type nTopRow = 0, nDataSize = 0;
- typename _StoreT::iterator it = rStore.begin(), itEnd = rStore.end();
- for (; it != itEnd; ++it, nTopRow += nDataSize)
- {
- nDataSize = it->size;
- switch (it->type)
- {
- case _Blk1::block_type:
- EachElem<_Blk1, typename _Blk1::iterator>(*it, rFuncElem);
- break;
- case _Blk2::block_type:
- EachElem<_Blk2, typename _Blk2::iterator>(*it, rFuncElem);
- break;
- case _Blk3::block_type:
- EachElem<_Blk3, typename _Blk3::iterator>(*it, rFuncElem);
- break;
- case _Blk4::block_type:
- EachElem<_Blk4, typename _Blk4::iterator>(*it, rFuncElem);
- break;
- default:
- rFuncElse(it->type, nTopRow, nDataSize);
- }
- }
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _Blk4, typename _FuncElem, typename _FuncElse>
-typename _StoreT::iterator
-ProcessElements4(
- const typename _StoreT::iterator& itPos, _StoreT& rStore,
- typename _StoreT::size_type nStart, typename _StoreT::size_type nEnd,
- _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
- typedef std::pair<typename _StoreT::iterator, typename _StoreT::size_type> PositionType;
-
- PositionType aPos = rStore.position(itPos, nStart);
- typename _StoreT::iterator it = aPos.first;
- typename _StoreT::size_type nOffset = aPos.second;
- typename _StoreT::size_type nDataSize = 0;
- typename _StoreT::size_type nTopRow = nStart;
-
- for (; it != rStore.end() && nTopRow <= nEnd; ++it, nOffset = 0, nTopRow += nDataSize)
- {
- bool bLastBlock = false;
- nDataSize = it->size - nOffset;
- if (nTopRow + nDataSize - 1 > nEnd)
- {
- // Truncate the block.
- nDataSize = nEnd - nTopRow + 1;
- bLastBlock = true;
- }
-
- switch (it->type)
- {
- case _Blk1::block_type:
- EachElem<_Blk1, typename _Blk1::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- case _Blk2::block_type:
- EachElem<_Blk2, typename _Blk2::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- case _Blk3::block_type:
- EachElem<_Blk3, typename _Blk3::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- case _Blk4::block_type:
- EachElem<_Blk4, typename _Blk4::iterator>(*it, nOffset, nDataSize, rFuncElem);
- break;
- default:
- rFuncElse(it->type, nTopRow, nDataSize);
- }
-
- if (bLastBlock)
- break;
- }
-
- return it;
-}
-
template<typename _StoreT, typename _Blk1, typename _FuncElem, typename _FuncElse>
std::pair<typename _StoreT::const_iterator, typename _StoreT::size_type>
FindElement1(
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 6a9e81c24c94..062e618a5ce2 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -48,7 +48,6 @@ public:
sal_Unicode cDelimiter = 0 ) const;
void Join( const ScRange&, bool bIsInList = false );
- void Join( const ScRangeList& );
bool UpdateReference( UpdateRefMode, ScDocument*,
const ScRange& rWhere,
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index a2a6ed82cf6c..1f040054fede 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -117,38 +117,6 @@ bool ScCalcConfig::operator!= (const ScCalcConfig& r) const
return !operator==(r);
}
-namespace {
-
-OUString StringConversionToString(ScCalcConfig::StringConversion eConv)
-{
- switch (eConv)
- {
- case ScCalcConfig::StringConversion::ILLEGAL: return OUString("ILLEGAL");
- case ScCalcConfig::StringConversion::ZERO: return OUString("ZERO");
- case ScCalcConfig::StringConversion::UNAMBIGUOUS: return OUString("UNAMBIGUOUS");
- case ScCalcConfig::StringConversion::LOCALE: return OUString("LOCALE");
- default: return OUString::number((int) eConv);
- }
-}
-
-} // anonymous namespace
-
-std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig)
-{
- rStream << "{"
- "StringRefAddressSyntax=" << rConfig.meStringRefAddressSyntax << ","
- "StringConversion=" << StringConversionToString(rConfig.meStringConversion) << ","
- "EmptyStringAsZero=" << (rConfig.mbEmptyStringAsZero?"Y":"N") << ","
- "HasStringRefSyntax=" << (rConfig.mbHasStringRefSyntax?"Y":"N") << ","
- "OpenCLSubsetOnly=" << (rConfig.mbOpenCLSubsetOnly?"Y":"N") << ","
- "OpenCLAutoSelect=" << (rConfig.mbOpenCLAutoSelect?"Y":"N") << ","
- "OpenCLDevice='" << rConfig.maOpenCLDevice << "',"
- "OpenCLMinimumFormulaGroupSize=" << rConfig.mnOpenCLMinimumFormulaGroupSize << ","
- "OpenCLSubsetOpCodes={" << ScOpCodeSetToSymbolicString(rConfig.mpOpenCLSubsetOpCodes) << "},"
- "}";
- return rStream;
-}
-
OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes)
{
OUStringBuffer result;
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 5a0882ebeab6..8942f8779b85 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -344,15 +344,6 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList )
Append( r );
}
-void ScRangeList::Join( const ScRangeList& r )
-{
- if (this == &r)
- return;
-
- for (auto const& it : r.maRanges)
- Join( *it );
-}
-
bool ScRangeList::operator==( const ScRangeList& r ) const
{
if ( this == &r )