Kaydet (Commit) d7f1f91b authored tarafından Noel Grandin's avatar Noel Grandin

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
üst 2c62596c
...@@ -22,9 +22,6 @@ bool VectorRefArray::isValid() const ...@@ -22,9 +22,6 @@ bool VectorRefArray::isValid() const
return mpNumericArray || mpStringArray; 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 ) : SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ) :
FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {} FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {}
...@@ -33,21 +30,6 @@ FormulaToken* SingleVectorRefToken::Clone() const ...@@ -33,21 +30,6 @@ FormulaToken* SingleVectorRefToken::Clone() const
return new SingleVectorRefToken(maArray, mnRequestedLength, mnArrayLength); 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( DoubleVectorRefToken::DoubleVectorRefToken(
const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength, const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) : size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) :
...@@ -61,36 +43,6 @@ FormulaToken* DoubleVectorRefToken::Clone() const ...@@ -61,36 +43,6 @@ FormulaToken* DoubleVectorRefToken::Clone() const
maArrays, mnRequestedLength, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed); 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -56,14 +56,12 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken ...@@ -56,14 +56,12 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
size_t mnArrayLength; size_t mnArrayLength;
public: public:
SingleVectorRefToken( const double* pArray, size_t nReqLength, size_t nArrayLength );
SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ); SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength );
virtual FormulaToken* Clone() const; virtual FormulaToken* Clone() const;
const VectorRefArray& GetArray() const; inline const VectorRefArray& GetArray() const { return maArray; }
size_t GetRequestedArrayLength() const; inline size_t GetArrayLength() const { return mnArrayLength; }
size_t GetArrayLength() const;
}; };
/** /**
...@@ -90,12 +88,11 @@ public: ...@@ -90,12 +88,11 @@ public:
virtual FormulaToken* Clone() const; virtual FormulaToken* Clone() const;
const std::vector<VectorRefArray>& GetArrays() const; inline const std::vector<VectorRefArray>& GetArrays() const { return maArrays; }
size_t GetRequestedArrayLength() const; inline size_t GetArrayLength() const { return mnArrayLength; }
size_t GetArrayLength() const; inline size_t GetRefRowSize() const { return mnRefRowSize; }
size_t GetRefRowSize() const; inline bool IsStartFixed() const { return mbStartFixed; }
bool IsStartFixed() const; inline bool IsEndFixed() const { return mbEndFixed; }
bool IsEndFixed() const;
}; };
} }
......
...@@ -227,11 +227,8 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char) ...@@ -227,11 +227,8 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char)
drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
editeng::MisspellRange::MisspellRange() editeng::MisspellRange::MisspellRange()
editeng::Section::Section() editeng::Section::Section()
formula::DoubleVectorRefToken::GetRequestedArrayLength() const
formula::FormulaDlg::CheckMatrix() formula::FormulaDlg::CheckMatrix()
formula::FormulaTokenArray::AddString(unsigned short const*) formula::FormulaTokenArray::AddString(unsigned short const*)
formula::SingleVectorRefToken::GetRequestedArrayLength() const
formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long, unsigned long)
oglcanvas::CanvasHelper::flush() const 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 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 oox::core::Relations::getRelationsFromType(rtl::OUString const&) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment