summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-03 13:29:43 +0200
committerNoel Grandin <noel@peralex.com>2014-03-05 09:17:42 +0200
commitd7f1f91b194da1cb96e66268ce7ef38602aa5754 (patch)
tree900d87c3e8541eb9abdf7bf1cd23e080366a134b
parent2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc (diff)
remove unused code in formula/vectortoken
Remove these methods:. formula::DoubleVectorRefToken::GetRequestedArrayLength() formula::SingleVectorRefToken::GetRequestedArrayLength() formula::SingleVectorRefToken::SingleVectorRefToken( double const*, unsigned long, unsigned long) and optimise some accessor methods. Change-Id: I04f53593894a59dbefdd1cbc9505c6eb7cd8610b
-rw-r--r--formula/source/core/api/vectortoken.cxx48
-rw-r--r--include/formula/vectortoken.hxx17
-rw-r--r--unusedcode.easy3
3 files changed, 7 insertions, 61 deletions
diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx
index 57476f4fb512..bd75efba9e98 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -22,9 +22,6 @@ bool VectorRefArray::isValid() const
return mpNumericArray || mpStringArray;
}
-SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t nReqLength, size_t nArrayLength ) :
- FormulaToken(svSingleVectorRef, ocPush), maArray(pArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {}
-
SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ) :
FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {}
@@ -33,21 +30,6 @@ FormulaToken* SingleVectorRefToken::Clone() const
return new SingleVectorRefToken(maArray, mnRequestedLength, mnArrayLength);
}
-const VectorRefArray& SingleVectorRefToken::GetArray() const
-{
- return maArray;
-}
-
-size_t SingleVectorRefToken::GetRequestedArrayLength() const
-{
- return mnRequestedLength;
-}
-
-size_t SingleVectorRefToken::GetArrayLength() const
-{
- return mnArrayLength;
-}
-
DoubleVectorRefToken::DoubleVectorRefToken(
const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) :
@@ -61,36 +43,6 @@ FormulaToken* DoubleVectorRefToken::Clone() const
maArrays, mnRequestedLength, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
}
-const std::vector<VectorRefArray>& DoubleVectorRefToken::GetArrays() const
-{
- return maArrays;
-}
-
-size_t DoubleVectorRefToken::GetRequestedArrayLength() const
-{
- return mnRequestedLength;
-}
-
-size_t DoubleVectorRefToken::GetArrayLength() const
-{
- return mnArrayLength;
-}
-
-size_t DoubleVectorRefToken::GetRefRowSize() const
-{
- return mnRefRowSize;
-}
-
-bool DoubleVectorRefToken::IsStartFixed() const
-{
- return mbStartFixed;
-}
-
-bool DoubleVectorRefToken::IsEndFixed() const
-{
- return mbEndFixed;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 5fa596b57c00..ca858aecec34 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -56,14 +56,12 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
size_t mnArrayLength;
public:
- SingleVectorRefToken( const double* pArray, size_t nReqLength, size_t nArrayLength );
SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength );
virtual FormulaToken* Clone() const;
- const VectorRefArray& GetArray() const;
- size_t GetRequestedArrayLength() const;
- size_t GetArrayLength() const;
+ inline const VectorRefArray& GetArray() const { return maArray; }
+ inline size_t GetArrayLength() const { return mnArrayLength; }
};
/**
@@ -90,12 +88,11 @@ public:
virtual FormulaToken* Clone() const;
- const std::vector<VectorRefArray>& GetArrays() const;
- size_t GetRequestedArrayLength() const;
- size_t GetArrayLength() const;
- size_t GetRefRowSize() const;
- bool IsStartFixed() const;
- bool IsEndFixed() const;
+ inline const std::vector<VectorRefArray>& GetArrays() const { return maArrays; }
+ inline size_t GetArrayLength() const { return mnArrayLength; }
+ inline size_t GetRefRowSize() const { return mnRefRowSize; }
+ inline bool IsStartFixed() const { return mbStartFixed; }
+ inline bool IsEndFixed() const { return mbEndFixed; }
};
}
diff --git a/unusedcode.easy b/unusedcode.easy
index eb79e40cad58..9db3f03296e0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -227,11 +227,8 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char)
drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
editeng::MisspellRange::MisspellRange()
editeng::Section::Section()
-formula::DoubleVectorRefToken::GetRequestedArrayLength() const
formula::FormulaDlg::CheckMatrix()
formula::FormulaTokenArray::AddString(unsigned short const*)
-formula::SingleVectorRefToken::GetRequestedArrayLength() const
-formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long, unsigned long)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::core::Relations::getRelationsFromType(rtl::OUString const&) const