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

wrap field in VclPtr

Change-Id: Ica765d313edaf45eefeee49b2c40b1b595fa9daf
üst 734e4dc9
...@@ -114,7 +114,7 @@ class SwScrollNaviPopup; ...@@ -114,7 +114,7 @@ class SwScrollNaviPopup;
class SwScrollNaviToolBox : public ToolBox class SwScrollNaviToolBox : public ToolBox
{ {
SwScrollNaviPopup *m_pNaviPopup; VclPtr<SwScrollNaviPopup> m_pNaviPopup;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
...@@ -125,6 +125,8 @@ public: ...@@ -125,6 +125,8 @@ public:
, m_pNaviPopup(pNaviPopup) , m_pNaviPopup(pNaviPopup)
{ {
} }
virtual ~SwScrollNaviToolBox();
virtual void dispose() SAL_OVERRIDE;
}; };
class SwScrollNaviPopup : public SfxPopupWindow class SwScrollNaviPopup : public SfxPopupWindow
......
...@@ -510,6 +510,17 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) ...@@ -510,6 +510,17 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
return 0; return 0;
} }
SwScrollNaviToolBox::~SwScrollNaviToolBox()
{
disposeOnce();
}
void SwScrollNaviToolBox::dispose()
{
m_pNaviPopup.disposeAndClear();
ToolBox::dispose();
}
void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt ) void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
{ {
ToolBox::MouseButtonUp(rMEvt); ToolBox::MouseButtonUp(rMEvt);
...@@ -522,7 +533,6 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt ) ...@@ -522,7 +533,6 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(true)); SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(true));
SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(false)); SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(false));
ToolBox::RequestHelp( rHEvt ); ToolBox::RequestHelp( rHEvt );
} }
OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext) OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext)
......
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