diff options
Diffstat (limited to 'sfx2/source/appl/newhelp.hxx')
-rw-r--r-- | sfx2/source/appl/newhelp.hxx | 93 |
1 files changed, 53 insertions, 40 deletions
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 4ccf236b2049..add82d178f9b 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -60,7 +60,7 @@ private: public: ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~ContentListBox_Impl(); - + virtual void dispose() SAL_OVERRIDE; virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -76,11 +76,13 @@ class SfxHelpIndexWindow_Impl; class HelpTabPage_Impl : public TabPage { protected: - SfxHelpIndexWindow_Impl* m_pIdxWin; + VclPtr<SfxHelpIndexWindow_Impl> m_pIdxWin; public: HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); + virtual ~HelpTabPage_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual Control* GetLastFocusControl() = 0; }; @@ -90,10 +92,12 @@ public: class ContentTabPage_Impl : public HelpTabPage_Impl { private: - ContentListBox_Impl* m_pContentBox; + VclPtr<ContentListBox_Impl> m_pContentBox; public: ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); + virtual ~ContentTabPage_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -119,8 +123,8 @@ public: class IndexTabPage_Impl : public HelpTabPage_Impl { private: - IndexBox_Impl* m_pIndexCB; - PushButton* m_pOpenBtn; + VclPtr<IndexBox_Impl> m_pIndexCB; + VclPtr<PushButton> m_pOpenBtn; Idle aFactoryIdle; Timer aKeywordTimer; @@ -141,6 +145,7 @@ private: public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~IndexTabPage_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -195,12 +200,12 @@ public: class SearchTabPage_Impl : public HelpTabPage_Impl { private: - SearchBox_Impl* m_pSearchED; - PushButton* m_pSearchBtn; - CheckBox* m_pFullWordsCB; - CheckBox* m_pScopeCB; - SearchResultsBox_Impl* m_pResultsLB; - PushButton* m_pOpenBtn; + VclPtr<SearchBox_Impl> m_pSearchED; + VclPtr<PushButton> m_pSearchBtn; + VclPtr<CheckBox> m_pFullWordsCB; + VclPtr<CheckBox> m_pScopeCB; + VclPtr<SearchResultsBox_Impl> m_pResultsLB; + VclPtr<PushButton> m_pOpenBtn; OUString aFactory; @@ -217,6 +222,7 @@ private: public: SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~SearchTabPage_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -242,6 +248,7 @@ private: public: BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~BookmarksBox_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -249,13 +256,15 @@ public: class BookmarksTabPage_Impl : public HelpTabPage_Impl { private: - BookmarksBox_Impl* m_pBookmarksBox; - PushButton* m_pBookmarksPB; + VclPtr<BookmarksBox_Impl> m_pBookmarksBox; + VclPtr<PushButton> m_pBookmarksPB; DECL_LINK(OpenHdl, void *); public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + virtual ~BookmarksTabPage_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -273,8 +282,8 @@ class SfxHelpWindow_Impl; class SfxHelpIndexWindow_Impl : public vcl::Window, public VclBuilderContainer { private: - ListBox* m_pActiveLB; - TabControl* m_pTabCtrl; + VclPtr<ListBox> m_pActiveLB; + VclPtr<TabControl> m_pTabCtrl; Idle aIdle; @@ -283,12 +292,12 @@ private: Link aIndexKeywordLink; OUString sKeyword; - SfxHelpWindow_Impl* pParentWin; + VclPtr<SfxHelpWindow_Impl> pParentWin; - ContentTabPage_Impl* pCPage; - IndexTabPage_Impl* pIPage; - SearchTabPage_Impl* pSPage; - BookmarksTabPage_Impl* pBPage; + VclPtr<ContentTabPage_Impl> pCPage; + VclPtr<IndexTabPage_Impl> pIPage; + VclPtr<SearchTabPage_Impl> pSPage; + VclPtr<BookmarksTabPage_Impl> pBPage; long nMinWidth; bool bWasCursorLeftOrRight; @@ -312,6 +321,7 @@ private: public: SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); virtual ~SfxHelpIndexWindow_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -343,7 +353,7 @@ ContentTabPage_Impl* SfxHelpIndexWindow_Impl::GetContentPage() { if ( !pCPage ) { - pCPage = new ContentTabPage_Impl( m_pTabCtrl, this ); + pCPage = VclPtr<ContentTabPage_Impl>::Create( m_pTabCtrl, this ); pCPage->SetOpenHdl( aPageDoubleClickLink ); } return pCPage; @@ -352,7 +362,7 @@ IndexTabPage_Impl* SfxHelpIndexWindow_Impl::GetIndexPage() { if ( !pIPage ) { - pIPage = new IndexTabPage_Impl( m_pTabCtrl, this ); + pIPage = VclPtr<IndexTabPage_Impl>::Create( m_pTabCtrl, this ); pIPage->SetDoubleClickHdl( aPageDoubleClickLink ); pIPage->SetKeywordHdl( aIndexKeywordLink ); } @@ -363,7 +373,7 @@ SearchTabPage_Impl* SfxHelpIndexWindow_Impl::GetSearchPage() { if ( !pSPage ) { - pSPage = new SearchTabPage_Impl( m_pTabCtrl, this ); + pSPage = VclPtr<SearchTabPage_Impl>::Create( m_pTabCtrl, this ); pSPage->SetDoubleClickHdl( aPageDoubleClickLink ); } return pSPage; @@ -373,7 +383,7 @@ BookmarksTabPage_Impl* SfxHelpIndexWindow_Impl::GetBookmarksPage() { if ( !pBPage ) { - pBPage = new BookmarksTabPage_Impl( m_pTabCtrl, this ); + pBPage = VclPtr<BookmarksTabPage_Impl>::Create( m_pTabCtrl, this ); pBPage->SetDoubleClickHdl( aPageDoubleClickLink ); } return pBPage; @@ -392,7 +402,6 @@ class TextWin_Impl : public DockingWindow { public: TextWin_Impl( vcl::Window* pParent ); - virtual ~TextWin_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -405,8 +414,8 @@ class SfxHelpWindow_Impl; class SfxHelpTextWindow_Impl : public vcl::Window { private: - ToolBox aToolBox; - CheckBox aOnStartupCB; + VclPtr<ToolBox> aToolBox; + VclPtr<CheckBox> aOnStartupCB; Idle aSelectIdle; Image aIndexOnImage; Image aIndexOffImage; @@ -416,9 +425,9 @@ private: OUString aOnStartupText; OUString sCurrentFactory; - SfxHelpWindow_Impl* pHelpWin; - vcl::Window* pTextWin; - sfx2::SearchDialog* pSrchDlg; + VclPtr<SfxHelpWindow_Impl> pHelpWin; + VclPtr<vcl::Window> pTextWin; + VclPtr<sfx2::SearchDialog> pSrchDlg; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > @@ -426,12 +435,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xConfiguration; long nMinPos; - bool bIsDebug; - bool bIsIndexOn; - bool bIsInClose; - bool bIsFullWordSearch; + bool bIsDebug; + bool bIsIndexOn; + bool bIsInClose; + bool bIsFullWordSearch; - bool HasSelection() const; + bool HasSelection() const; void InitToolBoxImages(); void InitOnStartupBox( bool bOnlyText ); void SetOnStartupBoxPosition(); @@ -451,6 +460,7 @@ private: public: SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); virtual ~SfxHelpTextWindow_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -460,11 +470,11 @@ public: inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > getFrame() const { return xFrame; } - inline void SetSelectHdl( const Link& rLink ) { aToolBox.SetSelectHdl( rLink ); } + inline void SetSelectHdl( const Link& rLink ) { aToolBox->SetSelectHdl( rLink ); } void ToggleIndex( bool bOn ); void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ); void SetPageStyleHeaderOff() const; - inline ToolBox& GetToolBox() { return aToolBox; } + inline ToolBox& GetToolBox() { return *aToolBox.get(); } void CloseFrame(); void DoSearch(); }; @@ -485,8 +495,8 @@ friend class SfxHelpIndexWindow_Impl; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > xFrame; - SfxHelpIndexWindow_Impl* pIndexWin; - SfxHelpTextWindow_Impl* pTextWin; + VclPtr<SfxHelpIndexWindow_Impl> pIndexWin; + VclPtr<SfxHelpTextWindow_Impl> pTextWin; HelpInterceptor_Impl* pHelpInterceptor; HelpListener_Impl* pHelpListener; @@ -519,6 +529,7 @@ public: SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits nBits ); virtual ~SfxHelpWindow_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -556,9 +567,11 @@ public: class SfxAddHelpBookmarkDialog_Impl : public ModalDialog { private: - Edit* m_pTitleED; + VclPtr<Edit> m_pTitleED; public: SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true ); + virtual ~SfxAddHelpBookmarkDialog_Impl(); + virtual void dispose() SAL_OVERRIDE; void SetTitle( const OUString& rTitle ); OUString GetTitle() const { return m_pTitleED->GetText(); } |