diff options
Diffstat (limited to 'sfx2/source/inc/templdgi.hxx')
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 0cf88b1e7077..249a1f32d827 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -176,7 +176,7 @@ protected: SfxBindings* pBindings; SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC]; - vcl::Window* pWindow; + VclPtr<vcl::Window> pWindow; SfxModule* pModule; Idle* pIdle; @@ -184,13 +184,13 @@ protected: SfxStyleFamilies* pStyleFamilies; SfxTemplateItem* pFamilyState[MAX_FAMILIES]; SfxStyleSheetBasePool* pStyleSheetPool; - StyleTreeListBox_Impl* pTreeBox; + VclPtr<StyleTreeListBox_Impl> pTreeBox; SfxObjectShell* pCurObjShell; css::uno::Reference<css::frame::XModuleManager2> xModuleManager; DeletionWatcher* m_pDeletionWatcher; - SfxActionListBox aFmtLb; - ListBox aFilterLb; + VclPtr<SfxActionListBox> aFmtLb; + VclPtr<ListBox> aFilterLb; Size aSize; sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 @@ -367,7 +367,6 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); - virtual ~DropToolBox_Impl(); }; class SfxTemplateDialog_Impl : public SfxCommonTemplateDialog_Impl @@ -377,10 +376,10 @@ private: friend class DropToolBox_Impl; friend class SfxTemplatePanelControl; - vcl::Window* m_pFloat; - bool m_bZoomIn; - DropToolBox_Impl m_aActionTbL; - ToolBox m_aActionTbR; + VclPtr<vcl::Window> m_pFloat; + bool m_bZoomIn; + VclPtr<DropToolBox_Impl> m_aActionTbL; + VclPtr<ToolBox> m_aActionTbR; DECL_LINK( ToolBoxLSelect, ToolBox* ); DECL_LINK( ToolBoxRSelect, ToolBox* ); |