diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-13 14:50:19 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 20:58:55 +0100 |
commit | fbe6619a34b617a04a5135e40c70a172a44eefef (patch) | |
tree | 4cc507a0e9c6d9e6317b814f3a9a0e63e6301226 /include/sfx2/taskpane.hxx | |
parent | ce8cfbd3b90f11c3f2edc88a0dab625aabb6293d (diff) |
vcl: VclPtr conversion in sfx2
Change-Id: I78ea3f4304ace27c6db0e3d0651bd65043dcbc68
Diffstat (limited to 'include/sfx2/taskpane.hxx')
-rw-r--r-- | include/sfx2/taskpane.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index dadbdf1d300f..9768716adb51 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -93,7 +93,6 @@ namespace sfx2 vcl::Window& i_rParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame ); - virtual ~ModuleTaskPane(); /** determines whether a given module has any registered tool panels */ @@ -163,6 +162,8 @@ namespace sfx2 public: TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, vcl::Window* i_pParent, WinBits i_nBits ); + virtual ~TaskPaneDockingWindow(); + virtual void dispose() SAL_OVERRIDE; // ITaskPaneToolPanelAccess virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; @@ -175,8 +176,8 @@ namespace sfx2 virtual void onLayoutDone() SAL_OVERRIDE; private: - ModuleTaskPane m_aTaskPane; - TaskPaneController m_aPaneController; + VclPtr<ModuleTaskPane> m_aTaskPane; + TaskPaneController m_aPaneController; }; |