1 files changed, 14 insertions, 13 deletions

diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 1cbd63545850..962dd8ca8dd1 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -62,7 +62,7 @@ friend class SwEnvPreview;
 
     SwEnvItem       aEnvItem;
     SwWrtShell      *pSh;
-    Printer         *pPrinter;
+    VclPtr<Printer> pPrinter;
     SfxItemSet      *pAddresseeSet;
     SfxItemSet      *pSenderSet;
     sal_uInt16      m_nEnvPrintId;
@@ -73,25 +73,23 @@ friend class SwEnvPreview;
 public:
      SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert);
     virtual ~SwEnvDlg();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 class SwEnvPage : public SfxTabPage
 {
-    VclMultiLineEdit* m_pAddrEdit;
-    ListBox*      m_pDatabaseLB;
-    ListBox*      m_pTableLB;
-    ListBox*      m_pDBFieldLB;
-    PushButton*   m_pInsertBT;
-    CheckBox*     m_pSenderBox;
-    VclMultiLineEdit* m_pSenderEdit;
-    SwEnvPreview* m_pPreview;
+    VclPtr<VclMultiLineEdit> m_pAddrEdit;
+    VclPtr<ListBox>      m_pDatabaseLB;
+    VclPtr<ListBox>      m_pTableLB;
+    VclPtr<ListBox>      m_pDBFieldLB;
+    VclPtr<PushButton>   m_pInsertBT;
+    VclPtr<CheckBox>     m_pSenderBox;
+    VclPtr<VclMultiLineEdit> m_pSenderEdit;
+    VclPtr<SwEnvPreview> m_pPreview;
 
     SwWrtShell*   pSh;
     OUString      sActDBName;
 
-     SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwEnvPage();
-
     DECL_LINK( DatabaseHdl, ListBox * );
     DECL_LINK(FieldHdl, void *);
     DECL_LINK(SenderHdl, void *);
@@ -104,8 +102,11 @@ class SwEnvPage : public SfxTabPage
     using SfxTabPage::DeactivatePage;
 
 public:
+    SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet);
+    virtual ~SwEnvPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;