From bc25156521ee3f636ad702b5ae2d5972323a8a7b Mon Sep 17 00:00:00 2001 From: npcdoom Date: Sun, 27 Feb 2011 21:14:03 -0430 Subject: Remove deprecated List container. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Converted List to std::vector. - Added Append member function to ParagraphList. - Updated needed functions from Insert to Append in outliner/outliner.cxx. Signed-off-by: Luboš Luňák --- editeng/source/outliner/paralist.hxx | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'editeng/source/outliner/paralist.hxx') diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index e63c73c4fad7..f751c97aea9d 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -29,27 +29,33 @@ #ifndef _PARALIST_HXX #define _PARALIST_HXX -class Paragraph; +#include -#include #include -class ParagraphList : private List -{ -private: - Link aVisibleStateChangedHdl; +class Paragraph; +class ParagraphList +{ public: void Clear( BOOL bDestroyParagraphs ); - ULONG GetParagraphCount() const { return List::Count(); } - Paragraph* GetParagraph( ULONG nPos ) const { return (Paragraph*)List::GetObject( nPos ); } + sal_uInt32 GetParagraphCount() const + { + return maEntries.size(); + } - ULONG GetAbsPos( Paragraph* pParent ) const { return List::GetPos( pParent ); } - ULONG GetVisPos( Paragraph* pParagraph ); + Paragraph* GetParagraph( ULONG nPos ) const + { + return nPos < maEntries.size() ? maEntries[nPos] : NULL; + } - void Insert( Paragraph* pPara, ULONG nAbsPos = LIST_APPEND ) { List::Insert( pPara, nAbsPos ); } - void Remove( ULONG nPara ) { List::Remove( nPara ); } + ULONG GetAbsPos( Paragraph* pParent ) const; + ULONG GetVisPos( Paragraph* pParagraph ) const; + + void Append( Paragraph *pPara); + void Insert( Paragraph* pPara, ULONG nAbsPos); + void Remove( ULONG nPara ); void MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount ); Paragraph* NextVisible( Paragraph* ) const; @@ -67,6 +73,11 @@ public: void SetVisibleStateChangedHdl( const Link& rLink ) { aVisibleStateChangedHdl = rLink; } Link GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; } + +private: + + Link aVisibleStateChangedHdl; + std::vector maEntries; }; #endif -- cgit