1 files changed, 20 insertions, 38 deletions

diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index a9c08105e1..0ded6d8c89 100644
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,70 +27,52 @@
  ************************************************************************/
 
 #include <vcl/window.hxx>
+#include <vector>
 
 #define MARKER_NOMARKER	0xFFFF
 
-
 class SbModule;
-class BreakpointListe;
 struct Breakpoint;
 class ImageList;
 
-DECLARE_LIST( BreakpointList, Breakpoint* )
-
-class BreakpointWindow : public Window, public BreakpointList
+class BreakpointWindow : public Window
 {
 using Window::Scroll;
 
 public:
     BreakpointWindow( Window *pParent );
-//	~BreakpointWindow();
 
     void		Reset();
 
     void		SetModule( SbModule *pMod );
     void		SetBPsInModule();
 
-    void		InsertBreakpoint( USHORT nLine );
-    void		ToggleBreakpoint( USHORT nLine );
-    void		AdjustBreakpoints( ULONG nLine, BOOL bInserted );
+    void		InsertBreakpoint( sal_uInt32 nLine );
+    void		ToggleBreakpoint( sal_uInt32 nLine );
+    void		AdjustBreakpoints( sal_uInt32 nLine, bool bInserted );
 
     void		LoadBreakpoints( String aFilename );
     void		SaveBreakpoints( String aFilename );
 
-protected:
-    Breakpoint*	FindBreakpoint( ULONG nLine );
-
 private:
-    long			nCurYOffset;
-    USHORT			nMarkerPos;
-    SbModule*		pModule;
-    BOOL			bErrorMarker;
-    static ImageList *pImages;
+    ::std::vector< Breakpoint* > BreakpointList;
+    long                nCurYOffset;
+    sal_uInt32          nMarkerPos;
+    SbModule*           pModule;
+    bool                bErrorMarker;
+    static ImageList*   pImages;
 
 protected:
-    virtual void	Paint( const Rectangle& );
-    Breakpoint* 	FindBreakpoint( const Point& rMousePos );
-    void			ShowMarker( BOOL bShow );
-    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void    Paint( const Rectangle& );
+    Breakpoint*     FindBreakpoint( const Point& rMousePos );
+    Breakpoint*     FindBreakpoint( sal_uInt32 nLine );
+    void            ShowMarker( bool bShow );
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
 
 public:
-
-//	void			SetModulWindow( ModulWindow* pWin )
-//						{ pModulWindow = pWin; }
-
-    void			SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE );
-
-    virtual void        Scroll( long nHorzScroll, long nVertScroll,
-                                USHORT nFlags = 0 );
-    long&			GetCurYOffset() 		{ return nCurYOffset; }
+    void            SetMarkerPos( sal_uInt32 nLine, bool bErrorMarker = false );
+    virtual void    Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 );
+    long&           GetCurYOffset() 		{ return nCurYOffset; }
 };
 
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */