1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index a11a7309b66e..c6ca6ad40564 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -142,9 +142,9 @@ void ScViewForwarder::SetInvalid()
 
 class ScEditObjectViewForwarder : public SvxViewForwarder
 {
-    vcl::Window*             mpWindow;
+    VclPtr<vcl::Window> mpWindow;
     // #i49561# EditView needed for access to its visible area.
-    const EditView* mpEditView;
+    const EditView*     mpEditView;
 public:
                         ScEditObjectViewForwarder( vcl::Window* pWindow,
                                                    const EditView* _pEditView);
@@ -172,7 +172,7 @@ ScEditObjectViewForwarder::~ScEditObjectViewForwarder()
 
 bool ScEditObjectViewForwarder::IsValid() const
 {
-    return (mpWindow != NULL);
+    return (mpWindow != nullptr);
 }
 
 Rectangle ScEditObjectViewForwarder::GetVisArea() const
@@ -545,7 +545,7 @@ Rectangle ScPreviewNoteViewForwarder::GetVisArea() const
 class ScEditViewForwarder : public SvxEditViewForwarder
 {
     EditView*           mpEditView;
-    vcl::Window*             mpWindow;
+    VclPtr<vcl::Window> mpWindow;
 public:
                         ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin);
     virtual             ~ScEditViewForwarder();
@@ -1073,7 +1073,7 @@ ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView,
 
 ScAccessibleEditLineTextData::~ScAccessibleEditLineTextData()
 {
-    ScTextWnd* pTxtWnd = dynamic_cast< ScTextWnd* >(mpWindow);
+    ScTextWnd* pTxtWnd = dynamic_cast< ScTextWnd* >(mpWindow.get());
 
     if (pTxtWnd)
         pTxtWnd->RemoveAccessibleTextData( *this );
@@ -1094,7 +1094,7 @@ ScAccessibleEditLineTextData::~ScAccessibleEditLineTextData()
 
 void ScAccessibleEditLineTextData::Dispose()
 {
-    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
+    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow.get());
 
     if (pTxtWnd)
         pTxtWnd->RemoveAccessibleTextData( *this );
@@ -1110,7 +1110,7 @@ ScAccessibleTextData* ScAccessibleEditLineTextData::Clone() const
 
 SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
 {
-    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
+    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow.get());
 
     if (pTxtWnd)
     {
@@ -1156,7 +1156,7 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
 
 SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( bool bCreate )
 {
-    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
+    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow.get());
 
     if (pTxtWnd)
     {
@@ -1178,7 +1178,7 @@ SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( bool b
 
 void ScAccessibleEditLineTextData::ResetEditMode()
 {
-    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
+    ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow.get());
 
     if (mbEditEngineCreated && mpEditEngine)
         delete mpEditEngine;
@@ -1196,7 +1196,7 @@ void ScAccessibleEditLineTextData::TextChanged()
 {
     if (mbEditEngineCreated && mpEditEngine)
     {
-        ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
+        ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow.get());
 
         if (pTxtWnd)
             mpEditEngine->SetText(pTxtWnd->GetTextString());
@@ -1637,7 +1637,7 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder()
 class ScCsvViewForwarder : public SvxViewForwarder
 {
     Rectangle                   maBoundBox;
-    vcl::Window*                     mpWindow;
+    VclPtr<vcl::Window>         mpWindow;
 
 public:
     explicit                    ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox );
@@ -1658,7 +1658,7 @@ ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& r
 
 bool ScCsvViewForwarder::IsValid() const
 {
-    return mpWindow != NULL;
+    return mpWindow != nullptr;
 }
 
 Rectangle ScCsvViewForwarder::GetVisArea() const