1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 768125bf2a35..2dd8da99768f 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -147,7 +147,7 @@ struct ImpTextView
 {
     TextEngine*         mpTextEngine;
 
-    vcl::Window*             mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     TextSelection       maSelection;
     Point               maStartDocPos;
 //    TextPaM             maMBDownPaM;
@@ -156,7 +156,7 @@ struct ImpTextView
 
     TextDDInfo*         mpDDInfo;
 
-    VirtualDevice*      mpVirtDev;
+    VclPtr<VirtualDevice>  mpVirtDev;
 
     SelectionEngine*    mpSelEngine;
     TextSelFunctionSet* mpSelFuncSet;
@@ -235,7 +235,7 @@ TextView::~TextView()
 {
     delete mpImpl->mpSelEngine;
     delete mpImpl->mpSelFuncSet;
-    delete mpImpl->mpVirtDev;
+    mpImpl->mpVirtDev.disposeAndClear();
 
     if ( mpImpl->mpWindow->GetCursor() == mpImpl->mpCursor )
         mpImpl->mpWindow->SetCursor( 0 );
@@ -541,8 +541,7 @@ VirtualDevice* TextView::GetVirtualDevice()
 
 void TextView::EraseVirtualDevice()
 {
-    delete mpImpl->mpVirtDev;
-    mpImpl->mpVirtDev = 0;
+    mpImpl->mpVirtDev.disposeAndClear();
 }
 
 bool TextView::KeyInput( const KeyEvent& rKeyEvent )