vcl: VclPtr conversion in sfx2

Change-Id: I78ea3f4304ace27c6db0e3d0651bd65043dcbc68

25 files changed, 68 insertions, 45 deletions

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 5a19603bdca8..438a2b57171e 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -81,6 +81,7 @@ protected:
 
 public:
     virtual ~SfxModalDialog();
+    virtual void dispose() SAL_OVERRIDE;
     const SfxItemSet*   GetOutputItemSet() const { return pOutputSet; }
     const SfxItemSet*   GetInputItemSet() const { return pInputSet; }
 };
@@ -102,6 +103,7 @@ protected:
     SfxModelessDialog( SfxBindings*, SfxChildWindow*,
         vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~SfxModelessDialog();
+    virtual void dispose() SAL_OVERRIDE;
     virtual bool            Close() SAL_OVERRIDE;
     virtual void            Resize() SAL_OVERRIDE;
     virtual void            Move() SAL_OVERRIDE;
@@ -140,6 +142,7 @@ protected:
                                               const OString& rID, const OUString& rUIXMLDescription,
                                               const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
                             virtual ~SfxFloatingWindow();
+    virtual void            dispose() SAL_OVERRIDE;
 
     virtual void            StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     virtual bool            Close() SAL_OVERRIDE;
@@ -187,6 +190,7 @@ public:
         const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
 
     virtual             ~SfxSingleTabDialog();
+    virtual void        dispose() SAL_OVERRIDE;
 
     void                SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0);
     SfxTabPage*         GetTabPage() const { return pImpl->m_pSfxPage; }
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 9179c69d7d90..e5496c090d93 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -370,33 +370,35 @@ public:
 class CustomPropertiesYesNoButton : public Control
 {
 private:
-    RadioButton                     m_aYesButton;
-    RadioButton                     m_aNoButton;
+    VclPtr<RadioButton>             m_aYesButton;
+    VclPtr<RadioButton>             m_aNoButton;
 
 public:
     CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId );
+    virtual ~CustomPropertiesYesNoButton();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void    Resize() SAL_OVERRIDE;
 
-    inline void     CheckYes() { m_aYesButton.Check(); }
-    inline void     CheckNo() { m_aNoButton.Check(); }
-    inline bool     IsYesChecked() const { return m_aYesButton.IsChecked(); }
+    inline void     CheckYes() { m_aYesButton->Check(); }
+    inline void     CheckNo() { m_aNoButton->Check(); }
+    inline bool     IsYesChecked() const { return m_aYesButton->IsChecked(); }
 };
 
 // struct CustomPropertyLine ---------------------------------------------
 
 struct CustomPropertyLine
 {
-    ComboBox                        m_aNameBox;
-    CustomPropertiesTypeBox         m_aTypeBox;
-    CustomPropertiesEdit            m_aValueEdit;
-    CustomPropertiesDateField       m_aDateField;
-    CustomPropertiesTimeField       m_aTimeField;
-    const OUString                  m_sDurationFormat;
-    CustomPropertiesDurationField   m_aDurationField;
-    CustomPropertiesEditButton      m_aEditButton;
-    CustomPropertiesYesNoButton     m_aYesNoButton;
-    CustomPropertiesRemoveButton    m_aRemoveButton;
+    VclPtr<ComboBox>                      m_aNameBox;
+    VclPtr<CustomPropertiesTypeBox>       m_aTypeBox;
+    VclPtr<CustomPropertiesEdit>          m_aValueEdit;
+    VclPtr<CustomPropertiesDateField>     m_aDateField;
+    VclPtr<CustomPropertiesTimeField>     m_aTimeField;
+    const OUString                        m_sDurationFormat;
+    VclPtr<CustomPropertiesDurationField> m_aDurationField;
+    VclPtr<CustomPropertiesEditButton>    m_aEditButton;
+    VclPtr<CustomPropertiesYesNoButton>   m_aYesNoButton;
+    VclPtr<CustomPropertiesRemoveButton>  m_aRemoveButton;
 
     bool                            m_bIsDate;
     bool                            m_bIsRemoved;
@@ -416,15 +418,15 @@ private:
     FixedText*                          m_pHeaderAccType;
     FixedText*                          m_pHeaderAccValue;
 
-    ComboBox                            m_aNameBox;
-    ListBox                             m_aTypeBox;
-    Edit                                m_aValueEdit;
-    DateField                           m_aDateField;
-    TimeField                           m_aTimeField;
-    Edit                                m_aDurationField;
-    PushButton                          m_aEditButton;
-    CustomPropertiesYesNoButton         m_aYesNoButton;
-    ImageButton                         m_aRemoveButton;
+    VclPtr<ComboBox>                    m_aNameBox;
+    VclPtr<ListBox>                     m_aTypeBox;
+    VclPtr<Edit>                        m_aValueEdit;
+    VclPtr<DateField>                   m_aDateField;
+    VclPtr<TimeField>                   m_aTimeField;
+    VclPtr<Edit>                        m_aDurationField;
+    VclPtr<PushButton>                  m_aEditButton;
+    VclPtr<CustomPropertiesYesNoButton> m_aYesNoButton;
+    VclPtr<ImageButton>                 m_aRemoveButton;
 
     sal_Int32                           m_nLineHeight;
     sal_Int32                           m_nScrollPos;
@@ -454,6 +456,7 @@ public:
         FixedText *pHeaderAccType,
         FixedText *pHeaderAccValue);
     virtual ~CustomPropertiesWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool                InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
     sal_uInt16          GetVisibleLineCount() const;
@@ -490,6 +493,7 @@ private:
 public:
     CustomPropertiesControl(vcl::Window* pParent);
     virtual ~CustomPropertiesControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void            AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
 
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 57f256707658..e5a5ff8a704b 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -84,6 +84,7 @@ public:
                                           vcl::Window* pParent,
                                           const OString& rID, const OUString& rUIXMLDescription );
                         virtual ~SfxDockingWindow();
+    virtual void        dispose() SAL_OVERRIDE;
 
     void                Initialize (SfxChildWinInfo* pInfo);
     virtual void        FillInfo(SfxChildWinInfo&) const;
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index eb0c4c6dcb8c..8fe7920473c4 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -53,6 +53,7 @@ class SfxInfoBarWindow : public vcl::Window
     public:
         SfxInfoBarWindow(vcl::Window* parent, const OUString& sId, const OUString& sMessage);
         virtual ~SfxInfoBarWindow( );
+        virtual void dispose() SAL_OVERRIDE;
 
         const OUString& getId() const { return m_sId; }
         virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
@@ -77,6 +78,7 @@ class SfxInfoBarContainerWindow : public vcl::Window
     public:
         SfxInfoBarContainerWindow(SfxInfoBarContainerChild* pChildWin);
         virtual ~SfxInfoBarContainerWindow( );
+        virtual void dispose() SAL_OVERRIDE;
 
         SfxInfoBarWindow* appendInfoBar(const OUString& sId, const OUString& sMessage);
         SfxInfoBarWindow* getInfoBar(const OUString& sId);
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index eded8ba18751..42c265637306 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -81,6 +81,7 @@ friend class SfxStyleDialog;
 
     SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
     virtual ~SfxManageStyleSheetPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     static SfxTabPage*  Create(vcl::Window *pParent, const SfxItemSet *rAttrSet );
 
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 48b6dab5cc38..05482a4e1027 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -67,6 +67,7 @@ public:
 
     SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0);
     virtual ~SfxNewFileDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     // Returns false, when '- No -' is set as Template
     // Template names can only be obtained when IsTemplate() returns true.
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index f0f47e26bb15..c41744f83eec 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -36,7 +36,7 @@ private:
     ComboBox* m_pColBox;
     OKButton* m_pOKBtn;
 
-    MessageDialog aQueryOverwriteBox;
+    VclPtr<MessageDialog> aQueryOverwriteBox;
     SfxStyleSheetBasePool&  rPool;
 
     DECL_DLLPRIVATE_LINK( OKHdl, Control * );
@@ -45,6 +45,7 @@ private:
 public:
     SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& );
     virtual ~SfxNewStyleDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     OUString                GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); }
 };
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 4857ce4b1235..477e98ef6a48 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -94,7 +94,6 @@ protected:
 public:
 
                         SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
-                        virtual ~SfxCommonPrintOptionsTabPage();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 1468ee81fe82..22378a52f503 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -45,6 +45,7 @@ public:
                                                    SfxViewShell *pViewShell,
                                                    const SfxItemSet *rOptions );
     virtual                 ~SfxPrintOptionsDialog();
+    virtual void            dispose() SAL_OVERRIDE;
 
     bool                    Construct();
     virtual short           Execute() SAL_OVERRIDE;
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 68176cf8a7eb..1affc2e23b58 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -42,7 +42,6 @@ class SFX2_DLLPUBLIC RecentDocsView : public ThumbnailView
 {
 public:
     RecentDocsView( vcl::Window* pParent );
-    virtual ~RecentDocsView();
 
     void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId);
 
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 2777088ddc60..eaf83e751a90 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -34,7 +34,6 @@ class SfxSecurityPage : public SfxTabPage
 
 protected:
     SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
-    virtual ~SfxSecurityPage();
 
     virtual bool            FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 381745da7648..4bb527a70a01 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -41,6 +41,7 @@ class SFX2_DLLPUBLIC SidebarToolBox
 public:
     SidebarToolBox(vcl::Window* pParentWindow);
     virtual ~SidebarToolBox (void);
+    virtual void dispose() SAL_OVERRIDE;
 
     using ToolBox::InsertItem;
     virtual void InsertItem(const OUString& rCommand,
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index 9e9bef903aeb..e837c87d6ae1 100644
--- a/include/sfx2/styledlg.hxx
+++ b/include/sfx2/styledlg.hxx
@@ -41,6 +41,7 @@ public:
         const OUString& rUIXMLDescription, SfxStyleSheetBase&);
 
     virtual ~SfxStyleDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     SfxStyleSheetBase&          GetStyleSheet() { return *pStyle; }
     const SfxStyleSheetBase&    GetStyleSheet() const { return *pStyle; }
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 2465321b3acd..e30588f25043 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -129,6 +129,7 @@ public:
                  const OUString& rID, const OUString& rUIXMLDescription,
                  const SfxItemSet * = 0, bool bEditFmt = false);
     virtual ~SfxTabDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     sal_uInt16          AddTabPage( const OString& rName,           // Name of the label for the page in the notebook .ui
                                     CreateTabPage pCreateFunc,      // != 0
@@ -249,6 +250,7 @@ protected:
 
 public:
     virtual             ~SfxTabPage();
+    virtual void        dispose() SAL_OVERRIDE;
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
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;
     };
 
 
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e6d538874fb8..6061a5b77025 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -151,6 +151,7 @@ public:
                                             vcl::Window* pParentWindow,
                                             WinBits nBits );
                             virtual ~SfxPopupWindow();
+    virtual void            dispose() SAL_OVERRIDE;
 
     virtual SfxPopupWindow* Clone() const;
     virtual void            MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 5509374c25b2..41979ca0dfc6 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -83,7 +83,8 @@ public:
     TemplateAbstractView(vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
     TemplateAbstractView(vcl::Window* pParent);
 
-    virtual ~TemplateAbstractView ();
+    virtual ~TemplateAbstractView();
+    virtual void dispose() SAL_OVERRIDE;
 
     void insertItem (const TemplateItemProperties &rTemplate);
 
@@ -137,8 +138,8 @@ protected:
     sal_uInt16 mnCurRegionId;
     OUString maCurRegionName;
 
-    PushButton maAllButton;
-    FixedText  maFTName;
+    VclPtr<PushButton> maAllButton;
+    VclPtr<FixedText>  maFTName;
 
     Link maOpenRegionHdl;
     Link maOpenTemplateHdl;
diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx
index 005201b364d7..205083554d52 100644
--- a/include/sfx2/templatedefaultview.hxx
+++ b/include/sfx2/templatedefaultview.hxx
@@ -17,7 +17,6 @@ class SFX2_DLLPUBLIC TemplateDefaultView : public TemplateLocalView
 {
 public:
     TemplateDefaultView(Window *pParent);
-    virtual ~TemplateDefaultView();
 
     virtual void reload() SAL_OVERRIDE;
 protected:
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 8b133f40a042..76ea4bda5317 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -50,7 +50,8 @@ public:
 
     SfxTemplateManagerDlg(vcl::Window *parent = NULL);
 
-    virtual ~SfxTemplateManagerDlg ();
+    virtual ~SfxTemplateManagerDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void setSaveMode();
 
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index 9f5d9dfd2965..fabd7409fd32 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -27,7 +27,8 @@ public:
 
     SfxTemplateInfoDlg (vcl::Window *pParent = NULL);
 
-    virtual ~SfxTemplateInfoDlg ();
+    virtual ~SfxTemplateInfoDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     void loadDocument (const OUString &rURL);
 
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 6d2e1d044dcf..123a6f6f13b5 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -32,6 +32,7 @@ public:
     TemplateLocalView ( vcl::Window* pParent );
 
     virtual ~TemplateLocalView ();
+    virtual void dispose() SAL_OVERRIDE;
 
     // Fill view with template folders thumbnails
     virtual void Populate () SAL_OVERRIDE;
diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index 6c64e9a6dcaf..ada041dcb85e 100644
--- a/include/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
@@ -23,8 +23,6 @@ public:
 
     TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
 
-    virtual ~TemplateRemoteView ();
-
     virtual void showRootRegion () SAL_OVERRIDE;
 
     virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE;
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index a3237d345bd9..b9eb528fcae4 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -43,6 +43,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow
 public:
     SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow);
     virtual ~SfxTemplatePanelControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 2c9967b601da..2191ef5845e9 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -183,6 +183,7 @@ public:
     ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false);
 
     virtual ~ThumbnailView();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 97fdebc11fd2..6c4b5e9ad02d 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -24,6 +24,7 @@
 #include <sfx2/dockwin.hxx>
 
 #include <vcl/toolbox.hxx>
+#include <vcl/vclptr.hxx>
 #include <tools/svborder.hxx>
 
 
@@ -43,6 +44,7 @@ namespace sfx2
         );
 
         virtual ~TitledDockingWindow();
+        virtual void dispose() SAL_OVERRIDE;
 
         /** sets a title to be displayed in the docking window
         */
@@ -77,11 +79,11 @@ namespace sfx2
         /** returns the content window, which is to be used as parent window for any content to be displayed
             in the docking window.
         */
-        vcl::Window&       GetContentWindow()          { return m_aContentWindow; }
-        const vcl::Window& GetContentWindow() const    { return m_aContentWindow; }
+        vcl::Window&       GetContentWindow()          { return *m_aContentWindow.get(); }
+        const vcl::Window& GetContentWindow() const    { return *m_aContentWindow.get(); }
 
-        ToolBox&        GetToolBox()        { return m_aToolbox; }
-        const ToolBox&  GetToolBox() const  { return m_aToolbox; }
+        ToolBox&        GetToolBox()        { return *m_aToolbox.get(); }
+        const ToolBox&  GetToolBox() const  { return *m_aToolbox.get(); }
 
         /** Return the border that is painted around the inner window as
             decoration.
@@ -126,8 +128,8 @@ namespace sfx2
 
     private:
         OUString            m_sTitle;
-        ToolBox             m_aToolbox;
-        Window              m_aContentWindow;
+        VclPtr<ToolBox>     m_aToolbox;
+        VclPtr<Window>      m_aContentWindow;
 
         Link                m_aEndDockingHdl;