Kaydet (Commit) 4fcde4fe authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Caolán McNamara

Hint assertions and sanity checks added.

Change-Id: I83bf8866c8855b3266703eca62010d28388c5a07
Reviewed-on: https://gerrit.libreoffice.org/13880Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 01fb1701
...@@ -103,13 +103,25 @@ public: ...@@ -103,13 +103,25 @@ public:
SwTxtAttr * Cut( const size_t nPosInStart ); SwTxtAttr * Cut( const size_t nPosInStart );
inline const SwTxtAttr * GetStart( const size_t nPos ) const inline const SwTxtAttr * GetStart( const size_t nPos ) const
{ return m_HintStarts[nPos]; } {
assert(nPos < m_HintStarts.size());
return m_HintStarts[nPos];
}
inline const SwTxtAttr * GetEnd( const size_t nPos ) const inline const SwTxtAttr * GetEnd( const size_t nPos ) const
{ return m_HintEnds [nPos]; } {
assert(nPos < m_HintEnds.size());
return m_HintEnds[nPos];
}
inline SwTxtAttr * GetStart( const size_t nPos ) inline SwTxtAttr * GetStart( const size_t nPos )
{ return m_HintStarts[nPos]; } {
assert(nPos < m_HintStarts.size());
return m_HintStarts[nPos];
}
inline SwTxtAttr * GetEnd( const size_t nPos ) inline SwTxtAttr * GetEnd( const size_t nPos )
{ return m_HintEnds [nPos]; } {
assert(nPos < m_HintStarts.size());
return m_HintEnds[nPos];
}
inline size_t GetEndCount() const { return m_HintEnds.size(); } inline size_t GetEndCount() const { return m_HintEnds.size(); }
inline size_t GetStartCount() const { return m_HintStarts.size(); } inline size_t GetStartCount() const { return m_HintStarts.size(); }
...@@ -122,8 +134,8 @@ public: ...@@ -122,8 +134,8 @@ public:
inline SwTxtAttr * GetTextHint( const size_t nIdx ) inline SwTxtAttr * GetTextHint( const size_t nIdx )
{ return GetStart(nIdx); } { return GetStart(nIdx); }
inline const SwTxtAttr * operator[]( const size_t nIdx ) const inline const SwTxtAttr * operator[]( const size_t nIdx ) const
{ return m_HintStarts[nIdx]; } { return GetStart(nIdx); }
inline size_t Count() const { return m_HintStarts.size(); } inline size_t Count() const { return GetStartCount(); }
#ifdef DBG_UTIL #ifdef DBG_UTIL
bool Check(bool) const; bool Check(bool) const;
......
...@@ -132,6 +132,10 @@ void SwpHintsArray::DeleteAtPos( const size_t nPos ) ...@@ -132,6 +132,10 @@ void SwpHintsArray::DeleteAtPos( const size_t nPos )
bool SwpHintsArray::Contains( const SwTxtAttr *pHt ) const bool SwpHintsArray::Contains( const SwTxtAttr *pHt ) const
{ {
#ifdef DBG_UTIL
Check(true);
#endif
// DO NOT use find() here! // DO NOT use find() here!
// if called from SwTxtNode::InsertItem, pHt has already been deleted, // if called from SwTxtNode::InsertItem, pHt has already been deleted,
// so it cannot be dereferenced // so it cannot be dereferenced
......
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