11 files changed, 171 insertions, 79 deletions

diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 4ca2d999d1b6..5d710e5b8e5d 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -107,7 +107,7 @@ private:
     com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxParent;  /// parent window
     com::sun::star::uno::Reference< XComponentContext > mxContext;
 
-    XMLFilterSettingsDialog* mpDialog;
+    VclPtr<XMLFilterSettingsDialog> mpDialog;
 };
 
 
@@ -266,11 +266,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
 {
     ::SolarMutexGuard aGuard;
 
-    if( mpDialog )
-    {
-        delete mpDialog;
-        mpDialog = NULL;
-    }
+    mpDialog.disposeAndClear();
 
     if (pXSLTResMgr)
     {
@@ -328,14 +324,14 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException,
         pXSLTResMgr = ResMgr::CreateResMgr( "xsltdlg", Application::GetSettings().GetUILanguageTag() );
     }
 
-    if( NULL == mpDialog )
+    if( nullptr == mpDialog )
     {
         vcl::Window* pParent = DIALOG_NO_PARENT;
         if (mxParent.is())
             pParent = VCLUnoHelper::GetWindow(mxParent);
 
         Reference< XComponent > xComp( this );
-        mpDialog = new XMLFilterSettingsDialog(pParent, mxContext);
+        mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(pParent, mxContext);
         mpDialog->Execute();
     }
     else if( !mpDialog->IsVisible() )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index ba832bfea60b..5865d812f555 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -103,7 +103,24 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
     }
 }
 
+XMLFilterSettingsDialog::~XMLFilterSettingsDialog()
+{
+    disposeOnce();
+}
 
+void XMLFilterSettingsDialog::dispose()
+{
+    m_pFilterListBox.clear();
+    m_pCtrlFilterList.clear();
+    m_pPBNew.clear();
+    m_pPBEdit.clear();
+    m_pPBTest.clear();
+    m_pPBDelete.clear();
+    m_pPBSave.clear();
+    m_pPBOpen.clear();
+    m_pPBClose.clear();
+    ModelessDialog::dispose();
+}
 
 IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton )
 {
@@ -225,11 +242,11 @@ void XMLFilterSettingsDialog::onNew()
     aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
 
     // execute XML Filter Dialog
-    XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo );
-    if ( aDlg.Execute() == RET_OK )
+    ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo );
+    if ( aDlg->Execute() == RET_OK )
     {
         // insert the new filter
-        insertOrEdit( aDlg.getNewFilterInfo() );
+        insertOrEdit( aDlg->getNewFilterInfo() );
     }
 }
 
@@ -246,10 +263,10 @@ void XMLFilterSettingsDialog::onEdit()
         filter_info_impl* pOldInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
 
         // execute XML Filter Dialog
-        XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo );
-        if ( aDlg.Execute() == RET_OK )
+        ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo );
+        if ( aDlg->Execute() == RET_OK )
         {
-            filter_info_impl* pNewInfo = aDlg.getNewFilterInfo();
+            filter_info_impl* pNewInfo = aDlg->getNewFilterInfo();
 
             if( !(*pOldInfo == *pNewInfo) )
             {
@@ -771,8 +788,8 @@ void XMLFilterSettingsDialog::onTest()
     {
         filter_info_impl* pInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
 
-        XMLFilterTestDialog aDlg(this, mxContext);
-        aDlg.test( *pInfo );
+        ScopedVclPtrInstance< XMLFilterTestDialog > aDlg(this, mxContext);
+        aDlg->test( *pInfo );
     }
 }
 
@@ -789,8 +806,8 @@ void XMLFilterSettingsDialog::onDelete()
         OUString aMessage(RESIDSTR(STR_WARN_DELETE));
         aMessage = aMessage.replaceFirst( aPlaceHolder, pInfo->maFilterName );
 
-        WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES),    aMessage );
-        if( aWarnBox.Execute() == RET_YES )
+        ScopedVclPtrInstance< WarningBox > aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage );
+        if( aWarnBox->Execute() == RET_YES )
         {
             try
             {
@@ -919,8 +936,8 @@ void XMLFilterSettingsDialog::onSave()
             aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
         }
 
-        InfoBox aBox(this, aMsg );
-        aBox.Execute();
+        ScopedVclPtrInstance< InfoBox > aBox(this, aMsg );
+        aBox->Execute();
     }
 }
 
@@ -985,8 +1002,8 @@ void XMLFilterSettingsDialog::onOpen()
             aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) );
         }
 
-        InfoBox aBox(this, aMsg );
-        aBox.Execute();
+        ScopedVclPtrInstance< InfoBox > aBox(this, aMsg );
+        aBox->Execute();
     }
 }
 
@@ -1339,12 +1356,12 @@ SvxPathControl::SvxPathControl(vcl::Window* pParent)
     : Window(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_TABSTOP | WB_DIALOGCONTROL | WB_BORDER)
     , bHasBeenShown(false)
 {
-    m_pVBox = new VclVBox(this);
+    m_pVBox = VclPtr<VclVBox>::Create(this);
 
-    m_pHeaderBar = new HeaderBar(m_pVBox, WB_BOTTOMBORDER);
+    m_pHeaderBar = VclPtr<HeaderBar>::Create(m_pVBox, WB_BOTTOMBORDER);
     m_pHeaderBar->set_height_request(GetTextHeight() + 6);
 
-    m_pFocusCtrl = new XMLFilterListBox(m_pVBox, this);
+    m_pFocusCtrl = VclPtr<XMLFilterListBox>::Create(m_pVBox, this);
     m_pFocusCtrl->set_fill(true);
     m_pFocusCtrl->set_expand(true);
 
@@ -1399,8 +1416,15 @@ Size SvxPathControl::GetOptimalSize() const
 
 SvxPathControl::~SvxPathControl()
 {
-    delete m_pFocusCtrl;
-    delete m_pHeaderBar;
+    disposeOnce();
+}
+
+void SvxPathControl::dispose()
+{
+    m_pFocusCtrl.disposeAndClear();
+    m_pHeaderBar.disposeAndClear();
+    m_pVBox.disposeAndClear();
+    vcl::Window::dispose();
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPathControl(vcl::Window *pParent, VclBuilder::stringmap &)
@@ -1446,7 +1470,16 @@ XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl
     m_pHeaderBar->Show();
 }
 
+XMLFilterListBox::~XMLFilterListBox()
+{
+    disposeOnce();
+}
 
+void XMLFilterListBox::dispose()
+{
+    m_pHeaderBar.clear();
+    SvTabListBox::dispose();
+}
 
 void XMLFilterListBox::Paint( const Rectangle& rRect )
 {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 85bb4d79094a..df26aaf95685 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -39,9 +39,9 @@ class SvxPathControl : public vcl::Window
 {
 private:
     bool bHasBeenShown;
-    VclVBox* m_pVBox;
-    HeaderBar* m_pHeaderBar;
-    XMLFilterListBox* m_pFocusCtrl;
+    VclPtr<VclVBox> m_pVBox;
+    VclPtr<HeaderBar> m_pHeaderBar;
+    VclPtr<XMLFilterListBox> m_pFocusCtrl;
 protected:
     virtual void Resize() SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -50,6 +50,7 @@ public:
     HeaderBar* getHeaderBar() { return m_pHeaderBar; }
     XMLFilterListBox* getListBox() { return m_pFocusCtrl; }
     virtual ~SvxPathControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 };
@@ -59,7 +60,7 @@ class HeaderBar;
 class XMLFilterListBox : public SvTabListBox
 {
 private:
-    HeaderBar*  m_pHeaderBar;
+    VclPtr<HeaderBar>  m_pHeaderBar;
 
     DECL_LINK( TabBoxScrollHdl_Impl, SvTabListBox* );
     DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
@@ -68,6 +69,8 @@ private:
 
 public:
     XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl);
+    virtual ~XMLFilterListBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     /** adds a new filter info entry to the ui filter list */
     void addFilterEntry( const filter_info_impl* pInfo );
@@ -84,6 +87,8 @@ class XMLFilterSettingsDialog : public ModelessDialog
 public:
     XMLFilterSettingsDialog(vcl::Window* pParent,
         const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext);
+    virtual ~XMLFilterSettingsDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK(ClickHdl_Impl, PushButton * );
     DECL_LINK(SelectionChangedHdl_Impl, void * );
@@ -124,15 +129,15 @@ private:
 
     std::vector< filter_info_impl* > maFilterVector;
 
-    XMLFilterListBox*   m_pFilterListBox;
-    SvxPathControl* m_pCtrlFilterList;
-    PushButton* m_pPBNew;
-    PushButton* m_pPBEdit;
-    PushButton* m_pPBTest;
-    PushButton* m_pPBDelete;
-    PushButton* m_pPBSave;
-    PushButton* m_pPBOpen;
-    CloseButton* m_pPBClose;
+    VclPtr<XMLFilterListBox>   m_pFilterListBox;
+    VclPtr<SvxPathControl> m_pCtrlFilterList;
+    VclPtr<PushButton> m_pPBNew;
+    VclPtr<PushButton> m_pPBEdit;
+    VclPtr<PushButton> m_pPBTest;
+    VclPtr<PushButton> m_pPBDelete;
+    VclPtr<PushButton> m_pPBSave;
+    VclPtr<PushButton> m_pPBOpen;
+    VclPtr<CloseButton> m_pPBClose;
 
     bool m_bIsClosable;
 
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 4494a74ba799..ff725cc040fe 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -56,13 +56,13 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr,
     m_pTabCtrl->SetActivatePageHdl( LINK( this, XMLFilterTabDialog, ActivatePageHdl ) );
     m_pTabCtrl->SetDeactivatePageHdl( LINK( this, XMLFilterTabDialog, DeactivatePageHdl ) );
 
-    mpBasicPage = new XMLFilterTabPageBasic(m_pTabCtrl);
+    mpBasicPage = VclPtr<XMLFilterTabPageBasic>::Create(m_pTabCtrl);
     mpBasicPage->SetInfo( mpNewInfo );
 
     m_nBasicPageId = m_pTabCtrl->GetPageId("general");
     m_pTabCtrl->SetTabPage(m_nBasicPageId, mpBasicPage);
 
-    mpXSLTPage = new XMLFilterTabPageXSLT(m_pTabCtrl);
+    mpXSLTPage = VclPtr<XMLFilterTabPageXSLT>::Create(m_pTabCtrl);
     mpXSLTPage->SetInfo( mpNewInfo );
 
     m_nXSLTPageId = m_pTabCtrl->GetPageId("transformation");
@@ -75,9 +75,17 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr,
 
 XMLFilterTabDialog::~XMLFilterTabDialog()
 {
-    delete mpBasicPage;
-    delete mpXSLTPage;
+    disposeOnce();
+}
+
+void XMLFilterTabDialog::dispose()
+{
+    mpBasicPage.disposeAndClear();
+    mpXSLTPage.disposeAndClear();
     delete mpNewInfo;
+    m_pTabCtrl.clear();
+    m_pOKBtn.clear();
+    TabDialog::dispose();
 }
 
 
@@ -257,8 +265,8 @@ bool XMLFilterTabDialog::onOk()
             aMessage = aMessage.replaceAll( "%s", aReplace1 );
         }
 
-        MessageDialog aBox(this, aMessage);
-        aBox.Execute();
+        ScopedVclPtrInstance< MessageDialog > aBox(this, aMessage);
+        aBox->Execute();
 
         if( pFocusWindow )
             pFocusWindow->GrabFocus();
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 1ec8594ceac4..221b704bb050 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -36,6 +36,7 @@ class XMLFilterTabDialog: public TabDialog
 public:
     XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
     virtual ~XMLFilterTabDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool onOk();
 
@@ -53,14 +54,14 @@ private:
     const filter_info_impl* mpOldInfo;
     filter_info_impl* mpNewInfo;
 
-    TabControl*     m_pTabCtrl;
-    OKButton*       m_pOKBtn;
+    VclPtr<TabControl>     m_pTabCtrl;
+    VclPtr<OKButton>       m_pOKBtn;
 
     sal_Int16 m_nBasicPageId;
     sal_Int16 m_nXSLTPageId;
 
-    XMLFilterTabPageBasic*  mpBasicPage;
-    XMLFilterTabPageXSLT* mpXSLTPage;
+    VclPtr<XMLFilterTabPageBasic>  mpBasicPage;
+    VclPtr<XMLFilterTabPageXSLT> mpXSLTPage;
 };
 
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index fb1d35ac2599..3f4d285a71a3 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -44,7 +44,19 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic(vcl::Window* pParent)
 
 XMLFilterTabPageBasic::~XMLFilterTabPageBasic()
 {
+    disposeOnce();
 }
+
+void XMLFilterTabPageBasic::dispose()
+{
+    m_pEDFilterName.clear();
+    m_pCBApplication.clear();
+    m_pEDInterfaceName.clear();
+    m_pEDExtension.clear();
+    m_pEDDescription.clear();
+    TabPage::dispose();
+}
+
 static OUString checkExtensions( const OUString& rExtensions )
 {
     const sal_Unicode* pSource = rExtensions.getStr();
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index 13d38d11e046..ac3876c868b8 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -34,6 +34,7 @@ class XMLFilterTabPageBasic : public TabPage
 public:
     XMLFilterTabPageBasic(vcl::Window* pParent);
     virtual ~XMLFilterTabPageBasic();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool FillInfo( filter_info_impl* pInfo );
     void SetInfo(const filter_info_impl* pInfo);
@@ -41,11 +42,11 @@ public:
     static OUString decodeComment( const OUString& rComment );
     static OUString encodeComment( const OUString& rComment );
 
-    Edit*              m_pEDFilterName;
-    ComboBox*          m_pCBApplication;
-    Edit*              m_pEDInterfaceName;
-    Edit*              m_pEDExtension;
-    VclMultiLineEdit*  m_pEDDescription;
+    VclPtr<Edit>              m_pEDFilterName;
+    VclPtr<ComboBox>          m_pCBApplication;
+    VclPtr<Edit>              m_pEDInterfaceName;
+    VclPtr<Edit>              m_pEDExtension;
+    VclPtr<VclMultiLineEdit>  m_pEDDescription;
 };
 
 #endif
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index a9d1cae94360..717463bc5bc5 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -58,6 +58,20 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) :
 
 XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT()
 {
+    disposeOnce();
+}
+
+void XMLFilterTabPageXSLT::dispose()
+{
+    m_pEDDocType.clear();
+    m_pEDExportXSLT.clear();
+    m_pPBExprotXSLT.clear();
+    m_pEDImportXSLT.clear();
+    m_pPBImportXSLT.clear();
+    m_pEDImportTemplate.clear();
+    m_pPBImportTemplate.clear();
+    m_pCBNeedsXSLT2.clear();
+    TabPage::dispose();
 }
 
 bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 01f36d518a7e..09c110fdb504 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -35,6 +35,7 @@ class XMLFilterTabPageXSLT : public TabPage
 public:
     XMLFilterTabPageXSLT( vcl::Window* pParent);
     virtual ~XMLFilterTabPageXSLT();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool FillInfo( filter_info_impl* pInfo );
     void SetInfo(const filter_info_impl* pInfo);
@@ -42,18 +43,18 @@ public:
     DECL_LINK( ClickBrowseHdl_Impl, PushButton * );
 
 
-    Edit*            m_pEDDocType;
+    VclPtr<Edit>            m_pEDDocType;
 
-    SvtURLBox*       m_pEDExportXSLT;
-    PushButton*      m_pPBExprotXSLT;
+    VclPtr<SvtURLBox>       m_pEDExportXSLT;
+    VclPtr<PushButton>      m_pPBExprotXSLT;
 
-    SvtURLBox*       m_pEDImportXSLT;
-    PushButton*      m_pPBImportXSLT;
+    VclPtr<SvtURLBox>       m_pEDImportXSLT;
+    VclPtr<PushButton>      m_pPBImportXSLT;
 
-    SvtURLBox*       m_pEDImportTemplate;
-    PushButton*      m_pPBImportTemplate;
+    VclPtr<SvtURLBox>       m_pEDImportTemplate;
+    VclPtr<PushButton>      m_pPBImportTemplate;
 
-    CheckBox*        m_pCBNeedsXSLT2;
+    VclPtr<CheckBox>        m_pCBNeedsXSLT2;
 
 private:
     void SetURL( SvtURLBox *rURLBox, const OUString& rURL );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 359300e31ea9..2563cadada86 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -79,7 +79,7 @@ public:
     // lang::XEventListener
     virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
 private:
-    XMLFilterTestDialog* mpDialog;
+    VclPtr<XMLFilterTestDialog> mpDialog;
 };
 
 GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog )
@@ -178,6 +178,11 @@ XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent,
 
 XMLFilterTestDialog::~XMLFilterTestDialog()
 {
+    disposeOnce();
+}
+
+void XMLFilterTestDialog::dispose()
+{
     try
     {
         if( mxGlobalBroadcaster.is() )
@@ -189,6 +194,21 @@ XMLFilterTestDialog::~XMLFilterTestDialog()
     }
 
     delete m_pFilterInfo;
+    m_pExport.clear();
+    m_pFTExportXSLTFile.clear();
+    m_pPBExportBrowse.clear();
+    m_pPBCurrentDocument.clear();
+    m_pFTNameOfCurrentFile.clear();
+    m_pImport.clear();
+    m_pFTImportXSLTFile.clear();
+    m_pFTImportTemplate.clear();
+    m_pFTImportTemplateFile.clear();
+    m_pCBXDisplaySource.clear();
+    m_pPBImportBrowse.clear();
+    m_pPBRecentFile.clear();
+    m_pFTNameOfRecentFile.clear();
+    m_pPBClose.clear();
+    ModalDialog::dispose();
 }
 
 void XMLFilterTestDialog::test( const filter_info_impl& rFilterInfo )
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 45953483b43a..3d69341fec30 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -37,6 +37,7 @@ public:
     XMLFilterTestDialog(vcl::Window* pParent,
         const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext);
     virtual ~XMLFilterTestDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void test( const filter_info_impl& rFilterInfo );
 
@@ -65,21 +66,21 @@ private:
     OUString m_sImportRecentFile;
     OUString m_sExportRecentFile;
 
-    VclContainer* m_pExport;
-    FixedText*  m_pFTExportXSLTFile;
-    PushButton* m_pPBExportBrowse;
-    PushButton* m_pPBCurrentDocument;
-    FixedText*  m_pFTNameOfCurrentFile;
-
-    VclContainer* m_pImport;
-    FixedText*  m_pFTImportXSLTFile;
-    FixedText*  m_pFTImportTemplate;
-    FixedText*  m_pFTImportTemplateFile;
-    CheckBox*   m_pCBXDisplaySource;
-    PushButton* m_pPBImportBrowse;
-    PushButton* m_pPBRecentFile;
-    FixedText*  m_pFTNameOfRecentFile;
-    CloseButton* m_pPBClose;
+    VclPtr<VclContainer> m_pExport;
+    VclPtr<FixedText>  m_pFTExportXSLTFile;
+    VclPtr<PushButton> m_pPBExportBrowse;
+    VclPtr<PushButton> m_pPBCurrentDocument;
+    VclPtr<FixedText>  m_pFTNameOfCurrentFile;
+
+    VclPtr<VclContainer> m_pImport;
+    VclPtr<FixedText>  m_pFTImportXSLTFile;
+    VclPtr<FixedText>  m_pFTImportTemplate;
+    VclPtr<FixedText>  m_pFTImportTemplateFile;
+    VclPtr<CheckBox>   m_pCBXDisplaySource;
+    VclPtr<PushButton> m_pPBImportBrowse;
+    VclPtr<PushButton> m_pPBRecentFile;
+    VclPtr<FixedText>  m_pFTNameOfRecentFile;
+    VclPtr<CloseButton> m_pPBClose;
 
     filter_info_impl* m_pFilterInfo;